diff --git a/common_test.go b/common_test.go
index 9d398613e..c753147b5 100644
--- a/common_test.go
+++ b/common_test.go
@@ -96,25 +96,20 @@ func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) {
 	defer session.Close()
 	defer log.Println("closing keyspace session")
 
-	err = session.control.query(`DROP KEYSPACE IF EXISTS ` + keyspace).Close()
+	err = createTable(session, `DROP KEYSPACE IF EXISTS `+keyspace)
 	if err != nil {
 		tb.Fatal(err)
 	}
 
-	err = session.control.query(fmt.Sprintf(`CREATE KEYSPACE %s
+	err = createTable(session, fmt.Sprintf(`CREATE KEYSPACE %s
 	WITH replication = {
 		'class' : 'SimpleStrategy',
 		'replication_factor' : %d
-	}`, keyspace, *flagRF)).Close()
+	}`, keyspace, *flagRF))
 
 	if err != nil {
 		tb.Fatal(err)
 	}
-
-	// lets just be sure
-	if err := session.control.awaitSchemaAgreement(); err != nil {
-		tb.Fatal(err)
-	}
 }
 
 func createSessionFromCluster(cluster *ClusterConfig, tb testing.TB) *Session {
@@ -130,6 +125,10 @@ func createSessionFromCluster(cluster *ClusterConfig, tb testing.TB) *Session {
 		tb.Fatal("createSession:", err)
 	}
 
+	if err := session.control.awaitSchemaAgreement(); err != nil {
+		tb.Fatal(err)
+	}
+
 	return session
 }