diff --git a/cassandra/src/test/java/org/hibernate/ogm/datastore/cassandra/utils/CassandraTestHelper.java b/cassandra/src/test/java/org/hibernate/ogm/datastore/cassandra/utils/CassandraTestHelper.java
index 92d24e4404..534d168230 100644
--- a/cassandra/src/test/java/org/hibernate/ogm/datastore/cassandra/utils/CassandraTestHelper.java
+++ b/cassandra/src/test/java/org/hibernate/ogm/datastore/cassandra/utils/CassandraTestHelper.java
@@ -11,6 +11,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -187,8 +188,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		return null;
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override
diff --git a/core/src/test/java/org/hibernate/ogm/utils/GridDialectTestHelper.java b/core/src/test/java/org/hibernate/ogm/utils/GridDialectTestHelper.java
index 9d734ff8ca..ab3135e567 100644
--- a/core/src/test/java/org/hibernate/ogm/utils/GridDialectTestHelper.java
+++ b/core/src/test/java/org/hibernate/ogm/utils/GridDialectTestHelper.java
@@ -90,10 +90,11 @@ public interface GridDialectTestHelper {
 	void dropSchemaAndDatabase(SessionFactory sessionFactory);
 
 	/**
-	 * Properties that needs to be overridden in configuration for tests to run
-	 * This is typical of the host and port defined using an environment variable.
+	 * Properties that needs to be added to the configuration for tests to run,
+	 * for example Neo4J will generate the database store path programmatically
+	 * so expecting it in a configuration file is not practical.
 	 */
-	Map<String, String> getEnvironmentProperties();
+	Map<String, String> getAdditionalConfigurationProperties();
 
 	/**
 	 * Returns the store-specific {@link DatastoreConfiguration} type for applying configuration options.
diff --git a/core/src/test/java/org/hibernate/ogm/utils/HashMapTestHelper.java b/core/src/test/java/org/hibernate/ogm/utils/HashMapTestHelper.java
index a30a14b9ee..69528b5fb1 100644
--- a/core/src/test/java/org/hibernate/ogm/utils/HashMapTestHelper.java
+++ b/core/src/test/java/org/hibernate/ogm/utils/HashMapTestHelper.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.ogm.utils;
 
+import java.util.Collections;
 import java.util.Map;
 
 import org.hibernate.Session;
@@ -80,8 +81,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		return null;
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override
diff --git a/core/src/test/java/org/hibernate/ogm/utils/TestHelper.java b/core/src/test/java/org/hibernate/ogm/utils/TestHelper.java
index 3f7d8d6a87..695d1c30a7 100644
--- a/core/src/test/java/org/hibernate/ogm/utils/TestHelper.java
+++ b/core/src/test/java/org/hibernate/ogm/utils/TestHelper.java
@@ -213,17 +213,10 @@ public static void checkCleanCache(SessionFactory sessionFactory) {
 
 	public static Map<String, String> getDefaultTestSettings() {
 		Map<String, String> settings = new HashMap<>();
-
 		settings.put( OgmProperties.ENABLED, "true" );
 		settings.put( Environment.HBM2DDL_AUTO, "none" );
 		settings.put( "hibernate.search.default.directory_provider", "ram" );
-
-		Map<String, String> environmentProperties = HELPER.getEnvironmentProperties();
-
-		if ( environmentProperties != null ) {
-			settings.putAll( environmentProperties );
-		}
-
+		settings.putAll( HELPER.getAdditionalConfigurationProperties() );
 		return settings;
 	}
 
diff --git a/couchdb/src/test/java/org/hibernate/ogm/datastore/couchdb/utils/CouchDBTestHelper.java b/couchdb/src/test/java/org/hibernate/ogm/datastore/couchdb/utils/CouchDBTestHelper.java
index 9af640c31a..7d3d5436a2 100644
--- a/couchdb/src/test/java/org/hibernate/ogm/datastore/couchdb/utils/CouchDBTestHelper.java
+++ b/couchdb/src/test/java/org/hibernate/ogm/datastore/couchdb/utils/CouchDBTestHelper.java
@@ -205,12 +205,12 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
+	public Map<String, String> getAdditionalConfigurationProperties() {
 		return environmentProperties();
 	}
 
 	public static Map<String, String> environmentProperties() {
-		Map<String, String> envProps = new HashMap<String, String>( 2 );
+		Map<String, String> envProps = new HashMap<String, String>( 6 );
 		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.HOST, envProps );
 		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.PORT, envProps );
 		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.DATABASE, envProps );
diff --git a/ehcache/src/test/java/org/hibernate/ogm/datastore/ehcache/utils/EhcacheTestHelper.java b/ehcache/src/test/java/org/hibernate/ogm/datastore/ehcache/utils/EhcacheTestHelper.java
index 20e2ca7b24..49f4ce198f 100644
--- a/ehcache/src/test/java/org/hibernate/ogm/datastore/ehcache/utils/EhcacheTestHelper.java
+++ b/ehcache/src/test/java/org/hibernate/ogm/datastore/ehcache/utils/EhcacheTestHelper.java
@@ -129,8 +129,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		return null;
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override
diff --git a/infinispan-remote/src/test/java/org/hibernate/ogm/datastore/infinispanremote/utils/InfinispanRemoteTestHelper.java b/infinispan-remote/src/test/java/org/hibernate/ogm/datastore/infinispanremote/utils/InfinispanRemoteTestHelper.java
index f2ac925e93..3c8da57a19 100644
--- a/infinispan-remote/src/test/java/org/hibernate/ogm/datastore/infinispanremote/utils/InfinispanRemoteTestHelper.java
+++ b/infinispan-remote/src/test/java/org/hibernate/ogm/datastore/infinispanremote/utils/InfinispanRemoteTestHelper.java
@@ -7,6 +7,7 @@
 package org.hibernate.ogm.datastore.infinispanremote.utils;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -77,8 +78,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		return null;
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override
diff --git a/infinispan/src/test/java/org/hibernate/ogm/datastore/infinispan/utils/InfinispanTestHelper.java b/infinispan/src/test/java/org/hibernate/ogm/datastore/infinispan/utils/InfinispanTestHelper.java
index 631c741294..7959294460 100644
--- a/infinispan/src/test/java/org/hibernate/ogm/datastore/infinispan/utils/InfinispanTestHelper.java
+++ b/infinispan/src/test/java/org/hibernate/ogm/datastore/infinispan/utils/InfinispanTestHelper.java
@@ -113,8 +113,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		return null;
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override
diff --git a/mongodb/src/test/java/org/hibernate/ogm/datastore/mongodb/utils/MongoDBTestHelper.java b/mongodb/src/test/java/org/hibernate/ogm/datastore/mongodb/utils/MongoDBTestHelper.java
index 68b162bf77..be4bfb6292 100644
--- a/mongodb/src/test/java/org/hibernate/ogm/datastore/mongodb/utils/MongoDBTestHelper.java
+++ b/mongodb/src/test/java/org/hibernate/ogm/datastore/mongodb/utils/MongoDBTestHelper.java
@@ -7,6 +7,7 @@
 
 package org.hibernate.ogm.datastore.mongodb.utils;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -240,21 +241,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		//read variables from the System properties set in the static initializer
-		Map<String, String> envProps = new HashMap<String, String>( 4 );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.HOST, envProps );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.PORT, envProps );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.USERNAME, envProps );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.PASSWORD, envProps );
-		return envProps;
-	}
-
-	private void copyFromSystemPropertiesToLocalEnvironment(String environmentVariableName, Map<String, String> envProps) {
-		String value = System.getProperties().getProperty( environmentVariableName );
-		if ( value != null && value.length() > 0 ) {
-			envProps.put( environmentVariableName, value );
-		}
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override
diff --git a/neo4j/src/test/java/org/hibernate/ogm/datastore/neo4j/utils/Neo4jTestHelper.java b/neo4j/src/test/java/org/hibernate/ogm/datastore/neo4j/utils/Neo4jTestHelper.java
index 7f303cebd4..32d89f7a5c 100644
--- a/neo4j/src/test/java/org/hibernate/ogm/datastore/neo4j/utils/Neo4jTestHelper.java
+++ b/neo4j/src/test/java/org/hibernate/ogm/datastore/neo4j/utils/Neo4jTestHelper.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.ogm.datastore.neo4j.utils;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -114,23 +115,8 @@ public void dropSchemaAndDatabase(SessionFactory sessionFactory) {
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		Map<String, String> envProps = new HashMap<String, String>( 2 );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.HOST, envProps );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.USERNAME, envProps );
-		copyFromSystemPropertiesToLocalEnvironment( OgmProperties.PASSWORD, envProps );
-
-		// The configuration file overrides the environment properties
-		envProps.putAll( PropertiesReader.getHibernateProperties() );
-		envProps.put( Neo4jProperties.DATABASE_PATH, EmbeddedNeo4jTestHelperDelegate.dbLocation() );
-		return envProps;
-	}
-
-	private void copyFromSystemPropertiesToLocalEnvironment(String environmentVariableName, Map<String, String> envProps) {
-		String value = System.getProperties().getProperty( environmentVariableName );
-		if ( value != null && value.length() > 0 ) {
-			envProps.put( environmentVariableName, value );
-		}
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.singletonMap( Neo4jProperties.DATABASE_PATH, EmbeddedNeo4jTestHelperDelegate.dbLocation() );
 	}
 
 	private static DatastoreProvider getDatastoreProvider(SessionFactory sessionFactory) {
diff --git a/redis/src/test/java/org/hibernate/ogm/datastore/redis/utils/RedisTestHelper.java b/redis/src/test/java/org/hibernate/ogm/datastore/redis/utils/RedisTestHelper.java
index 6998788ff6..6ed83c7832 100644
--- a/redis/src/test/java/org/hibernate/ogm/datastore/redis/utils/RedisTestHelper.java
+++ b/redis/src/test/java/org/hibernate/ogm/datastore/redis/utils/RedisTestHelper.java
@@ -7,6 +7,7 @@
 package org.hibernate.ogm.datastore.redis.utils;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -166,8 +167,8 @@ private RedisClusterCommands<String, String> getConnection(SessionFactory sessio
 	}
 
 	@Override
-	public Map<String, String> getEnvironmentProperties() {
-		return null;
+	public Map<String, String> getAdditionalConfigurationProperties() {
+		return Collections.emptyMap();
 	}
 
 	@Override