diff --git a/clone/test.sh b/clone/test.sh
deleted file mode 100755
index dd91fee3a..000000000
--- a/clone/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export PACKER_ACC=1
-go test -v "$@"
diff --git a/driver/test.sh b/driver/test.sh
deleted file mode 100755
index 14607e82e..000000000
--- a/driver/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export VSPHERE_DRIVER_ACC=1
-go test -v "$@"
diff --git a/iso/test.sh b/iso/test.sh
deleted file mode 100755
index dd91fee3a..000000000
--- a/iso/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export PACKER_ACC=1
-go test -v "$@"
diff --git a/test.sh b/test.sh
index a1db6c2ff..48d55a97c 100755
--- a/test.sh
+++ b/test.sh
@@ -1,5 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
 
-(cd driver && ./test.sh "$@")
-(cd clone && ./test.sh "$@")
-(cd iso && ./test.sh "$@")
\ No newline at end of file
+set -eux
+
+export PACKER_ACC=1
+
+go test -v ./driver ./iso ./clone