diff --git a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
index 2b09638d364..626c9aee2a9 100644
--- a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
+++ b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
@@ -540,8 +540,8 @@ public void should_set_routing_key_on_case_sensitive_keyspace_and_table() {
     session()
         .execute(
             "CREATE KEYSPACE \"Test\" WITH replication = { "
-                + "  'class': 'SimpleStrategy',"
-                + "  'replication_factor': '1'"
+                + "  'class': 'NetworkTopologyStrategy',"
+                + "  'datacenter1': '1'"
                 + "}");
     session().execute("CREATE TABLE \"Test\".\"Foo\" (i int PRIMARY KEY)");
 
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperKeyspaceTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperKeyspaceTest.java
index 59dcdfed81c..d98d5e914c6 100644
--- a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperKeyspaceTest.java
+++ b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperKeyspaceTest.java
@@ -33,10 +33,10 @@ public class MapperKeyspaceTest extends CCMTestsSupport {
   @Override
   public void onTestContextInitialized() {
     execute(
-        "CREATE KEYSPACE IF NOT EXISTS MapperKeyspaceTest WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}",
+        "CREATE KEYSPACE IF NOT EXISTS MapperKeyspaceTest WITH replication = {'class': 'NetworkTopologyStrategy', 'datacenter1': 1}",
         "CREATE TYPE IF NOT EXISTS MapperKeyspaceTest.address(street text)",
         "CREATE TABLE IF NOT EXISTS MapperKeyspaceTest.user(name text PRIMARY KEY, address frozen<address>)",
-        "CREATE KEYSPACE IF NOT EXISTS MapperKeyspaceTest2 WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}",
+        "CREATE KEYSPACE IF NOT EXISTS MapperKeyspaceTest2 WITH replication = {'class': 'NetworkTopologyStrategy', 'datacenter1': 1}",
         "CREATE TYPE IF NOT EXISTS MapperKeyspaceTest2.address(street text)",
         "CREATE TABLE IF NOT EXISTS MapperKeyspaceTest2.user(name text PRIMARY KEY, address frozen<address>)");
   }
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/UDTFieldMapperTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/UDTFieldMapperTest.java
index f66b4a5708a..c6d6cb5f31b 100644
--- a/driver-mapping/src/test/java/com/datastax/driver/mapping/UDTFieldMapperTest.java
+++ b/driver-mapping/src/test/java/com/datastax/driver/mapping/UDTFieldMapperTest.java
@@ -43,7 +43,7 @@ public void udt_and_tables_with_ks_created_in_another_session_should_be_mapped()
     // Create type and table
     session1.execute(
         "create keyspace if not exists java_509 "
-            + "with replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };");
+            + "with replication = { 'class' : 'NetworkTopologyStrategy', 'datacenter1' : 1 };");
     session1.execute("create type java_509.my_tuple (" + "type text, " + "value text);");
     session1.execute(
         "create table java_509.my_hash ("
@@ -75,7 +75,7 @@ public void udt_and_tables_without_ks_created_in_another_session_should_be_mappe
     Session session1 = cluster1.connect();
     session1.execute(
         "create keyspace if not exists java_509b "
-            + "with replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };");
+            + "with replication = { 'class' : 'NetworkTopologyStrategy', 'datacenter1' : 1 };");
     session1.execute("use java_509b");
     session1.execute("create type my_tuple (" + "type text, " + "value text);");
     session1.execute(