diff --git a/openecomp-be/tools/build/scripts/generate-cassandra-init-cql.sh b/openecomp-be/tools/build/scripts/generate-cassandra-init-cql.sh
index eaa9a3f..06065b1 100644
--- a/openecomp-be/tools/build/scripts/generate-cassandra-init-cql.sh
+++ b/openecomp-be/tools/build/scripts/generate-cassandra-init-cql.sh
@@ -26,7 +26,7 @@
 
 main()
 {
-        if [ $3 == 'yes' ]; then
+        if [ "$3" = "yes" ]; then
             echo "CREATE KEYSPACE IF NOT EXISTS dox WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };"
         fi
         echo "USE dox;"
diff --git a/openecomp-be/tools/build/scripts/zusammen-generate-cassandra-init-cql.sh b/openecomp-be/tools/build/scripts/zusammen-generate-cassandra-init-cql.sh
index b215fb3..8cb422a 100644
--- a/openecomp-be/tools/build/scripts/zusammen-generate-cassandra-init-cql.sh
+++ b/openecomp-be/tools/build/scripts/zusammen-generate-cassandra-init-cql.sh
@@ -27,7 +27,7 @@
 
 main()
 {
-        if [ $3 == 'yes' ]; then
+        if [ "$3" = "yes" ]; then
             echo "CREATE KEYSPACE IF NOT EXISTS $KEYSPACE_ZUSAMMEN WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 3 };"
         fi
         echo "USE $KEYSPACE_ZUSAMMEN;"