diff --git a/test/tools/libtesteth/ImportTest.cpp b/test/tools/libtesteth/ImportTest.cpp
index 5aad3102035..d7cc4a2fde1 100644
--- a/test/tools/libtesteth/ImportTest.cpp
+++ b/test/tools/libtesteth/ImportTest.cpp
@@ -608,7 +608,7 @@ void ImportTest::checkAllowedNetwork(string const& _network)
         // Can't use boost at this point
         std::cerr << TestOutputHelper::get().testName() + " Specified Network not found: "
                   << _network << "\n";
-        exit(1);
+        return;
     }
 }
 
diff --git a/test/tools/libtesteth/Options.cpp b/test/tools/libtesteth/Options.cpp
index da2404d66b1..a20c54f26dc 100644
--- a/test/tools/libtesteth/Options.cpp
+++ b/test/tools/libtesteth/Options.cpp
@@ -127,12 +127,12 @@ Options::Options(int argc, const char** argv)
         if (arg == "--help")
         {
             printHelp();
-            exit(0);
+			return;
         }
         else if (arg == "--version")
         {
             printVersion();
-            exit(0);
+			return;
         }
         else if (arg == "--vm" || arg == "--evmc")
         {
@@ -147,7 +147,7 @@ Options::Options(int argc, const char** argv)
             g_logVerbosity = 13;
 #else
             cerr << "--vmtrace option requires a build with cmake -DVMTRACE=1\n";
-            exit(1);
+			return;
 #endif
         }
         else if (arg == "--jsontrace")
@@ -232,7 +232,7 @@ Options::Options(int argc, const char** argv)
             else
             {
                 std::cerr << "Options file not found! Default options at: tests/src/randomCodeOptions.json\n";
-                exit(0);
+                return;
             }
         }
         else if (arg == "-t")
@@ -272,11 +272,11 @@ Options::Options(int argc, const char** argv)
             if (maxCodes > 1000 || maxCodes <= 0)
             {
                 cerr << "Argument for the option is invalid! (use range: 1...1000)\n";
-                exit(1);
+                return;
             }
             test::RandomCodeOptions options;
             cout << test::RandomCode::get().generate(maxCodes, options) << "\n";
-            exit(0);
+            return;
         }
         else if (arg == "--createRandomTest")
         {
@@ -309,7 +309,7 @@ Options::Options(int argc, const char** argv)
         else if (seenSeparator)
         {
             cerr << "Unknown option: " + arg << "\n";
-            exit(1);
+            return;
         }
     }
 
@@ -322,7 +322,7 @@ Options::Options(int argc, const char** argv)
             cerr << "--createRandomTest cannot be used with any of the options: " <<
                     "trValueIndex, trGasIndex, trDataIndex, nonetwork, singleTest, all, " <<
                     "stats, filltests, fillchain \n";
-            exit(1);
+            return;
         }
     }
     else
diff --git a/test/tools/libtesteth/boostTest.cpp b/test/tools/libtesteth/boostTest.cpp
index bad4b5409fc..31d163897c3 100644
--- a/test/tools/libtesteth/boostTest.cpp
+++ b/test/tools/libtesteth/boostTest.cpp
@@ -136,7 +136,7 @@ int main(int argc, const char* argv[])
     catch (dev::test::InvalidOption const& e)
     {
         std::cerr << *boost::get_error_info<errinfo_comment>(e) << "\n";
-        exit(1);
+        return 1;
     }
 
     dev::test::Options const& opt = dev::test::Options::get();