diff --git a/src/build-scripts/test/cpp.sh b/src/build-scripts/cpp/test-cpp.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/build-scripts/test/cpp.sh
rename to src/build-scripts/cpp/test-cpp.sh
diff --git a/src/build-scripts/test/cpp.hxml b/src/build-scripts/cpp/test.hxml
similarity index 51%
rename from src/build-scripts/test/cpp.hxml
rename to src/build-scripts/cpp/test.hxml
index 09503bfd..3fed5b00 100644
--- a/src/build-scripts/test/cpp.hxml
+++ b/src/build-scripts/cpp/test.hxml
@@ -1,3 +1,4 @@
 src/build-scripts/common-test-args.hxml
+-lib hxcpp
 -cpp bin/cpp/test
--cmd bash src/build-scripts/test/cpp.sh
\ No newline at end of file
+-cmd bash src/build-scripts/cpp/test-cpp.sh
\ No newline at end of file
diff --git a/src/build-scripts/test/interp.hxml b/src/build-scripts/interp/test.hxml
similarity index 100%
rename from src/build-scripts/test/interp.hxml
rename to src/build-scripts/interp/test.hxml
diff --git a/src/build-scripts/test/js.hxml b/src/build-scripts/js/test.hxml
similarity index 100%
rename from src/build-scripts/test/js.hxml
rename to src/build-scripts/js/test.hxml
diff --git a/src/build-scripts/test/nodejs.hxml b/src/build-scripts/nodejs/test.hxml
similarity index 100%
rename from src/build-scripts/test/nodejs.hxml
rename to src/build-scripts/nodejs/test.hxml
diff --git a/src/build-scripts/test/py.sh b/src/build-scripts/py/test-py.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/build-scripts/test/py.sh
rename to src/build-scripts/py/test-py.sh
diff --git a/src/build-scripts/test/py.hxml b/src/build-scripts/py/test.hxml
similarity index 60%
rename from src/build-scripts/test/py.hxml
rename to src/build-scripts/py/test.hxml
index b7590847..ceb7ddb6 100644
--- a/src/build-scripts/test/py.hxml
+++ b/src/build-scripts/py/test.hxml
@@ -1,3 +1,3 @@
 src/build-scripts/common-test-args.hxml
 --python bin/py/test.py
---cmd bash src/build-scripts/test/py.sh
\ No newline at end of file
+--cmd bash src/build-scripts/py/test-py.sh
\ No newline at end of file
diff --git a/src/test/cases/BasicTestCase.kiss b/src/test/cases/BasicTestCase.kiss
index 9bfe1911..28f0cf08 100644
--- a/src/test/cases/BasicTestCase.kiss
+++ b/src/test/cases/BasicTestCase.kiss
@@ -1,11 +1,14 @@
 // (defvar) declares static variables
 (defvar message "Howdy")
+
 // #| ... |# parses and injects raw Haxe code
 (defvar mathResult #|5 + 6 * 3|#) // Order of operations will apply
+
 // (defun) declares static functions
 (defun myFloor [num] 
     // funcalls can use dot access
     (Math.floor num))
+
 // functions are resolved in the macro context
 (defvar funResult (myFloor 7.5))
 
diff --git a/test-all.sh b/test-all.sh
index acb8a639..c7741396 100644
--- a/test-all.sh
+++ b/test-all.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-TEST_FILES=src/build-scripts/test/*.hxml
+TEST_FILES=src/build-scripts/**/test.hxml
 for TEST_FILE in $TEST_FILES
 do
 	haxe $TEST_FILE
diff --git a/test.sh b/test.sh
index 99cd7f02..cf864838 100755
--- a/test.sh
+++ b/test.sh
@@ -1,11 +1,12 @@
 #! /bin/bash
 
-if [ ! -z "$TRAVIS_OS_NAME" ]
-then
-    haxelib install utest
-    haxelib install hxnodejs
-fi
-
 HISS_TARGET=${HISS_TARGET:-$1}
 HISS_TARGET=${HISS_TARGET:-interp}
-haxe src/build-scripts/test/$HISS_TARGET.hxml
\ No newline at end of file
+
+if [ ! -z "$TRAVIS_OS_NAME" ]
+then
+    (cd src/build-scripts && haxelib install all)
+    (cd src/build-scripts/$HISS_TARGET && haxelib install all)
+fi
+
+haxe src/build-scripts/$HISS_TARGET/test.hxml
\ No newline at end of file