diff --git a/tests/.print-arg-3 b/tests/Cross-shell test support/.print-arg-3
similarity index 100%
rename from tests/.print-arg-3
rename to tests/Cross-shell test support/.print-arg-3
diff --git a/tests/Cross-shell test support/.test-urchin-x/This should run as $TEST_SHELL b/tests/Cross-shell test support/.test-urchin-x/This should run as $TEST_SHELL
new file mode 100755
index 0000000..91a6a53
--- /dev/null
+++ b/tests/Cross-shell test support/.test-urchin-x/This should run as $TEST_SHELL	
@@ -0,0 +1,4 @@
+#! ../../urchin -x
+echo "Running shell: $(ps -o comm= -p $$ && :)"
+echo "\$TEST_SHELL: $TEST_SHELL"
+[ "$TEST_SHELL" = 'bash' ]
diff --git a/tests/Cross-shell test support/urchin -x should start the $TEST_SHELL. b/tests/Cross-shell test support/urchin -x should start the $TEST_SHELL.
new file mode 100755
index 0000000..9438c49
--- /dev/null
+++ b/tests/Cross-shell test support/urchin -x should start the $TEST_SHELL.	
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+test c = $(../../urchin -x .print-arg-3 a 'b b b b' c d e)
diff --git a/tests/Cross-shell test support/urchin should pass the $TEST_SHELL variable to urchin -x b/tests/Cross-shell test support/urchin should pass the $TEST_SHELL variable to urchin -x
new file mode 100755
index 0000000..3d90d3b
--- /dev/null
+++ b/tests/Cross-shell test support/urchin should pass the $TEST_SHELL variable to urchin -x	
@@ -0,0 +1,3 @@
+#!/bin/sh
+export TEST_SHELL=/bin/bash
+../../urchin .test-urchin-x
diff --git a/tests/urchin -x should start the $TEST_SHELL. b/tests/urchin -x should start the $TEST_SHELL.
deleted file mode 100755
index e137df2..0000000
--- a/tests/urchin -x should start the $TEST_SHELL.	
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-test c = $(../urchin -x .print-arg-3 a 'b b b b' c d e)