diff --git a/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala b/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala
index c69eaf0008..da55452a9c 100644
--- a/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala
+++ b/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala
@@ -290,7 +290,7 @@ class CommandLineToolsSuite extends SnappyTestRunner {
 
   test("ODBC_FailOverTest_AddServer_BeforeConn") {
     val flag = System.getenv("SNAPPY_NATIVE_ENABLED")
-    if (flag.equalsIgnoreCase("true")) {
+    if (flag != null && flag.equalsIgnoreCase("true")) {
       var scriptPath = s"$snappyNativeTestDir/failoverTest_AddServer_BeforeConn.sh"
       var consoleOutput = s"$scriptPath $snappyProductDir $snappyNativeTestDir".!!
       assert(consoleOutput.contains("Test executed successfully connected to"),
@@ -301,7 +301,7 @@ class CommandLineToolsSuite extends SnappyTestRunner {
 
   test("ODBC_FailOverTest_AddServer_AfterConn") {
     val flag = System.getenv("SNAPPY_NATIVE_ENABLED")
-    if (flag.equalsIgnoreCase("true")) {
+    if (flag != null && flag.equalsIgnoreCase("true")) {
       var scriptPath = s"$snappyNativeTestDir/failoverTest_AddServer_AfterConn.sh"
       var consoleOutput = s"$scriptPath $snappyProductDir $snappyNativeTestDir".!!
       assert(consoleOutput.contains("Test executed successfully connected to"),