diff --git a/tests/go/.godir b/tests/apps/go/.godir
similarity index 100%
rename from tests/go/.godir
rename to tests/apps/go/.godir
diff --git a/tests/go/Procfile b/tests/apps/go/Procfile
similarity index 100%
rename from tests/go/Procfile
rename to tests/apps/go/Procfile
diff --git a/tests/apps/go/check_deploy b/tests/apps/go/check_deploy
new file mode 100755
index 000000000..b75487a8e
--- /dev/null
+++ b/tests/apps/go/check_deploy
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -e; test "$(curl -s $1)" == "go"
\ No newline at end of file
diff --git a/tests/go/web.go b/tests/apps/go/web.go
similarity index 88%
rename from tests/go/web.go
rename to tests/apps/go/web.go
index a51f5db43..3bb0cc5c9 100644
--- a/tests/go/web.go
+++ b/tests/apps/go/web.go
@@ -16,5 +16,5 @@ func main() {
 }
 
 func hello(res http.ResponseWriter, req *http.Request) {
-    fmt.Fprintln(res, "hello, world")
+    fmt.Fprintln(res, "go")
 }
diff --git a/tests/apps/nodejs-express/check_deploy b/tests/apps/nodejs-express/check_deploy
index 3bb12d4c4..3cb2ed65f 100755
--- a/tests/apps/nodejs-express/check_deploy
+++ b/tests/apps/nodejs-express/check_deploy
@@ -1,3 +1,2 @@
 #!/bin/bash
-set -e
-test "$(curl $1)" == "nodejs/express2"
\ No newline at end of file
+set -e; test "$(curl -s $1)" == "nodejs/express"
\ No newline at end of file
diff --git a/tests/apps/php/check_deploy b/tests/apps/php/check_deploy
new file mode 100755
index 000000000..cd04f836e
--- /dev/null
+++ b/tests/apps/php/check_deploy
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -e; test "$(curl -s $1)" == "<html><h3>php</h3></html>"
\ No newline at end of file
diff --git a/tests/apps/php/index.php b/tests/apps/php/index.php
new file mode 100644
index 000000000..9bdf28df5
--- /dev/null
+++ b/tests/apps/php/index.php
@@ -0,0 +1 @@
+<html><?php echo '<h3>php</h3>'; ?></html>
diff --git a/tests/python/Procfile b/tests/apps/python-flask/Procfile
similarity index 100%
rename from tests/python/Procfile
rename to tests/apps/python-flask/Procfile
diff --git a/tests/apps/python-flask/check_deploy b/tests/apps/python-flask/check_deploy
new file mode 100755
index 000000000..90fb12aa5
--- /dev/null
+++ b/tests/apps/python-flask/check_deploy
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -e; test "$(curl -s $1)" == "python/flask"
\ No newline at end of file
diff --git a/tests/python/hello.py b/tests/apps/python-flask/hello.py
similarity index 74%
rename from tests/python/hello.py
rename to tests/apps/python-flask/hello.py
index 90b188892..9dc2cec78 100644
--- a/tests/python/hello.py
+++ b/tests/apps/python-flask/hello.py
@@ -5,4 +5,4 @@ app = Flask(__name__)
 
 @app.route('/')
 def hello():
-        return 'Hello World!'
+        return 'python/flask'
diff --git a/tests/python/requirements.txt b/tests/apps/python-flask/requirements.txt
similarity index 100%
rename from tests/python/requirements.txt
rename to tests/apps/python-flask/requirements.txt
diff --git a/tests/php/index.php b/tests/php/index.php
deleted file mode 100644
index 5ad4f9f05..000000000
--- a/tests/php/index.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
- <head>
-  <title>PHP Test</title>
- </head>
- <body>
- <?php echo '<h3>Hello World</h3>'; ?>
- </body>
-</html>