diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp
index c8827cfde..a5ea2c933 100644
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@@ -436,16 +436,12 @@ int TestConnections::read_env()
         backend_ssl = false;
     }
 
-
     env = getenv("smoke");
-    if ((env != NULL) && ((strcasecmp(env, "yes") == 0) || (strcasecmp(env, "true") == 0) ))
+    if (env)
     {
-        smoke = true;
-    }
-    else
-    {
-        smoke = false;
+        smoke = strcasecmp(env, "yes") == 0 || strcasecmp(env, "true") == 0;
     }
+
     env = getenv("threads");
     if ((env != NULL))
     {