diff --git a/src/build-scripts/common-test-args.hxml b/src/build-scripts/common-test-args.hxml
index 7ff2f4e7..8e7f39d7 100644
--- a/src/build-scripts/common-test-args.hxml
+++ b/src/build-scripts/common-test-args.hxml
@@ -1,4 +1,3 @@
-src/build-scripts/common-args.hxml
 -lib utest
 -D test
 --main test.TestMain
\ No newline at end of file
diff --git a/src/build-scripts/cpp/test.hxml b/src/build-scripts/cpp/test.hxml
index 3fed5b00..1ad5852b 100644
--- a/src/build-scripts/cpp/test.hxml
+++ b/src/build-scripts/cpp/test.hxml
@@ -1,4 +1,3 @@
-src/build-scripts/common-test-args.hxml
 -lib hxcpp
 -cpp bin/cpp/test
 -cmd bash src/build-scripts/cpp/test-cpp.sh
\ No newline at end of file
diff --git a/src/build-scripts/interp/test.hxml b/src/build-scripts/interp/test.hxml
index fd72a549..7aa3ac0f 100644
--- a/src/build-scripts/interp/test.hxml
+++ b/src/build-scripts/interp/test.hxml
@@ -1,2 +1 @@
-src/build-scripts/common-test-args.hxml
 --interp
\ No newline at end of file
diff --git a/src/build-scripts/js/test.hxml b/src/build-scripts/js/test.hxml
index 0e61911c..eedcbcfa 100644
--- a/src/build-scripts/js/test.hxml
+++ b/src/build-scripts/js/test.hxml
@@ -1,3 +1,2 @@
-src/build-scripts/common-test-args.hxml
 --js bin/js/test.js
 --cmd node bin/js/test.js
\ No newline at end of file
diff --git a/src/build-scripts/nodejs/test.hxml b/src/build-scripts/nodejs/test.hxml
index a34d6f8b..2a197f12 100644
--- a/src/build-scripts/nodejs/test.hxml
+++ b/src/build-scripts/nodejs/test.hxml
@@ -1,4 +1,3 @@
-src/build-scripts/common-test-args.hxml
 -lib hxnodejs
 --js bin/nodejs/test.js
 --cmd node bin/nodejs/test.js
\ No newline at end of file
diff --git a/src/build-scripts/py/test-py.sh b/src/build-scripts/py/test-py.sh
index 662a1ba1..4d1f8009 100644
--- a/src/build-scripts/py/test-py.sh
+++ b/src/build-scripts/py/test-py.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-# Travis testing on Xenial
-if [ "$(uname)" = "Linux" ]; then
+# "python" is supposed to mean Python3 everywhere now, but not in practice
+if [ ! -z "$(which python3)" ]; then
     python3 bin/py/test.py
 else
     python bin/py/test.py
diff --git a/src/build-scripts/py/test.hxml b/src/build-scripts/py/test.hxml
index ceb7ddb6..9f09df4d 100644
--- a/src/build-scripts/py/test.hxml
+++ b/src/build-scripts/py/test.hxml
@@ -1,3 +1,2 @@
-src/build-scripts/common-test-args.hxml
 --python bin/py/test.py
 --cmd bash src/build-scripts/py/test-py.sh
\ No newline at end of file
diff --git a/test-all.sh b/test-all.sh
index c7741396..8574f513 100644
--- a/test-all.sh
+++ b/test-all.sh
@@ -1,10 +1,15 @@
 #! /bin/bash
+
+# For local testing. Dependencies won't be installed
+
 TEST_FILES=src/build-scripts/**/test.hxml
+
 for TEST_FILE in $TEST_FILES
 do
-	haxe $TEST_FILE
+    echo $TEST_FILE
+    haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml $TEST_FILE
     if [ ! $? -eq 0 ]
     then
         exit $?
     fi
-done
+done
\ No newline at end of file
diff --git a/test.sh b/test.sh
index cf864838..706f46ac 100755
--- a/test.sh
+++ b/test.sh
@@ -3,10 +3,11 @@
 HISS_TARGET=${HISS_TARGET:-$1}
 HISS_TARGET=${HISS_TARGET:-interp}
 
+# For CI tests, force install the dependencies
 if [ ! -z "$TRAVIS_OS_NAME" ]
 then
-    (cd src/build-scripts && haxelib install all)
-    (cd src/build-scripts/$HISS_TARGET && haxelib install all)
+    (cd src/build-scripts && haxelib install all --always)
+    (cd src/build-scripts/$HISS_TARGET && haxelib install all --always)
 fi
 
-haxe src/build-scripts/$HISS_TARGET/test.hxml
\ No newline at end of file
+haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml src/build-scripts/$HISS_TARGET/test.hxml
\ No newline at end of file