diff --git a/Dockerfiles/testrail_cassandra/custom-entrypoint.sh b/Dockerfiles/testrail_cassandra/custom-entrypoint.sh
new file mode 100644
index 0000000..0e8236c
--- /dev/null
+++ b/Dockerfiles/testrail_cassandra/custom-entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#set -e
+
+if [[ ! -z "$CASSANDRA_KEYSPACE" && $1 = 'cassandra' ]]; then
+  # Create default keyspace for single node cluster
+  CQL="CREATE KEYSPACE $CASSANDRA_KEYSPACE WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1};"
+  until echo $CQL | cqlsh; do
+    echo "cqlsh: Cassandra is unavailable - retry later"
+    sleep 2
+  done &
+fi
+
+exec /docker-entrypoint.sh "$@"