diff --git a/cucumber.yml b/cucumber.yml
deleted file mode 100644
index 78342a17..00000000
--- a/cucumber.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-default: --format pretty
-travis: --format progress
-html_report: --format progress --format html --out=features_report.html
diff --git a/script/cucumber b/script/cucumber
index 38a5e06f..ef19cff4 100755
--- a/script/cucumber
+++ b/script/cucumber
@@ -1,3 +1,9 @@
 #!/bin/bash
 
-bundle exec rake features
+if test -z "$TRAVIS"; then
+  PROFILE="--format pretty"
+else
+  PROFILE="--format progress"
+fi
+
+bundle exec cucumber $PROFILE "$@"
diff --git a/script/test b/script/test
index 95de44ef..7bb742ef 100755
--- a/script/test
+++ b/script/test
@@ -2,16 +2,19 @@
 #
 # Usage:
 #   script/test
-#   script/test <hi>
-
-set -x
+#   script/test <test_file>
 
 if [ -z "$1" ]; then
-  TEST_FILES="test/test_*.rb"
+  TEST_FILES="./test/test_*.rb"
 else
   TEST_FILES="$@"
 fi
 
+RAKE_LIB_DIR=$(ruby -e "puts Gem::Specification.find_by_name('rake').gem_dir + '/lib'")
+
 set -x
 
-bundle exec rake test
+time bundle exec ruby -I"lib:test" \
+  -I"${RAKE_LIB_DIR}" \
+  "${RAKE_LIB_DIR}/rake/rake_test_loader.rb" \
+  $TEST_FILES