diff --git a/libexec/bats b/libexec/bats
index 71f392f7..a707facd 100755
--- a/libexec/bats
+++ b/libexec/bats
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 version() {
   echo "Bats 0.4.0"
diff --git a/libexec/bats-exec-test b/libexec/bats-exec-test
index 8f3bd510..f9e43115 100755
--- a/libexec/bats-exec-test
+++ b/libexec/bats-exec-test
@@ -35,8 +35,11 @@ load() {
 
   if [ "${name:0:1}" = "/" ]; then
     filename="${name}"
-  else
-    filename="$BATS_TEST_DIRNAME/${name}.bash"
+  else if [ -f "$BATS_TEST_DIRNAME/${name}" ] ; then
+      filename="$BATS_TEST_DIRNAME/${name}"
+      else
+      filename="$BATS_TEST_DIRNAME/${name}.bash"
+    fi
   fi
 
   [ -f "$filename" ] || {