diff --git a/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/TestBase.java b/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/TestBase.java
index 97e864042..a3ed712f9 100644
--- a/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/TestBase.java
+++ b/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/TestBase.java
@@ -102,6 +102,20 @@ public static void initialize() throws IOException
             int port = node.getBroadcastRpcAddress().get().getPort();
             contactPoints.add(new InetSocketAddress(hostname, port));
         }
+        int count = 0;
+        while(initialSession.getMetadata().getKeyspace(ECCHRONOS_KEYSPACE).isEmpty() && count < 60)
+        {
+            count++;
+            LOG.warn("Ecchronos keyspace not found, retrying");
+            try
+            {
+                Thread.sleep(1000);
+            }
+            catch (InterruptedException e)
+            {
+                // Ignore
+            }
+        }
         initialSession.close();
 
         AuthProvider authProvider = new ProgrammaticPlainTextAuthProvider("eccuser", "eccpassword");