diff --git a/test/tests.json b/test/tests.json
index 2c16a69..8d2b16c 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -4,7 +4,8 @@
             "description": "Python TestClient",
             "lib": "py",
             "executable": "py/TestClient.py",
-            "extra_args":  ["--genpydir=py/gen-py"],
+            "exit": "hard",
+            "extra_args":  ["--genpydir=gen-py"],
             "protocols": [
                 "binary",
                 "compact",
@@ -27,6 +28,7 @@
             "description": "C++ TestClient",
             "lib": "cpp",
             "executable": "cpp/TestClient",
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",
@@ -50,6 +52,7 @@
             "description": "Nodejs TestClient",
             "lib": "nodejs",
             "executable": "../lib/nodejs/test/client.js",
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",
@@ -71,6 +74,7 @@
             "description": "Ruby TestClient",
             "lib": "ruby",
             "executable": "rb/integration/TestClient.rb",
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",
@@ -93,6 +97,7 @@
             "lib": "java",
             "executable": ["ant","-f","../lib/java/build.xml","-Dno-gen-thrift=\"\""],
             "extra_args": ["run-testclient"],
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",
@@ -118,8 +123,9 @@
             "description": "Python TSimpleServer",
             "lib": "py",
             "executable": "py/TestServer.py",
-            "extra_args": ["--genpydir=py/gen-py", "TSimpleServer"],
+            "extra_args": ["--genpydir=gen-py", "TSimpleServer"],
             "extra_delay": 0,
+            "exit": "hard",
             "protocols": [
                 "binary",
                 "compact",
@@ -142,6 +148,7 @@
             "description": "C++ TestServer",
             "lib": "cpp",
             "executable": "cpp/TestServer",
+            "exit": "hard",
             "protocols": [
                 "binary",
                 "compact",
@@ -165,6 +172,7 @@
             "description": "Ruby TestServer",
             "lib": "ruby",
             "executable": "rb/integration/TestServer.rb",
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",
@@ -186,6 +194,7 @@
             "description": "Nodejs TestServer",
             "lib": "nodejs",
             "executable": "../lib/nodejs/test/server.js",
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",
@@ -208,6 +217,7 @@
             "lib": "java",
             "executable": ["ant","-f","../lib/java/build.xml","-Dno-gen-thrift=\"\""],
             "extra_args": ["run-testserver"],
+            "exit": "soft",
             "protocols": [
                 "binary",
                 "compact",