diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp
index c93f5af42..79fc91c3b 100644
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@@ -30,6 +30,7 @@ static std::string required_repl_version;
 static std::string required_galera_version;
 static bool restart_galera = false;
 static bool require_galera = false;
+static bool require_columnstore = false;
 static bool multiple_maxscales = false;
 }
 
@@ -91,6 +92,11 @@ void TestConnections::require_galera(bool value)
     maxscale::require_galera = value;
 }
 
+void TestConnections::require_columnstore(bool value)
+{
+    maxscale::require_columnstore = value;
+}
+
 void TestConnections::restart_galera(bool value)
 {
     maxscale::restart_galera = value;
@@ -259,7 +265,13 @@ TestConnections::TestConnections(int argc, char* argv[])
 
     if (no_galera && maxscale::require_galera)
     {
-        cout << "Galera not in use, skipping test" <<endl;
+        cout << "Galera not in use, skipping test" << endl;
+        exit(0);
+    }
+
+    if (maxscale::require_columnstore)
+    {
+        cout << "ColumnStore testing is not yet implemented, skipping test" << endl;
         exit(0);
     }
 
diff --git a/maxscale-system-test/testconnections.h b/maxscale-system-test/testconnections.h
index d0135bb54..9042132dc 100644
--- a/maxscale-system-test/testconnections.h
+++ b/maxscale-system-test/testconnections.h
@@ -263,9 +263,12 @@ public:
     static void require_repl_version(const char* version);
     static void require_galera_version(const char* version);
 
-    /** Require that a backend is present*/
+    /** Require that galera is present*/
     static void require_galera(bool value);
 
+    /** Require that columnstore is present*/
+    static void require_columnstore(bool value);
+
     /**
      * @brief Specify whether galera should be restarted.
      *