diff --git a/scripts/test-xvfb.sh b/scripts/test-xvfb.sh
deleted file mode 100644
index 3d035a097a4ece9d5e24170eef7990ea0e93b5d1..0000000000000000000000000000000000000000
--- a/scripts/test-xvfb.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-xvfb-run ./test.sh "$@"
diff --git a/scripts/test.sh b/scripts/test.sh
index c8318a434dda391866df6c610bf92cadf035082b..ebe397741931217a9aa26ec8c03bfe69557927ab 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -29,9 +29,15 @@ test -d node_modules || ./scripts/npm.sh install
 # Build
 test -d out || ./node_modules/.bin/gulp compile
 echo "code $CODE"
+
 # Unit Tests
 export VSCODE_DEV=1
-if [[ "$OSTYPE" == "darwin"* ]]; then
+
+if [[ "$1" == "--xvfb" ]]; then
+	cd $ROOT ; \
+		xvfb-run "$CODE" test/electron/index.js "$@"
+
+elif [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
 		test/electron/index.js "$@"