diff --git a/scripts/features b/scripts/features
new file mode 100755
index 0000000..e7de577
--- /dev/null
+++ b/scripts/features
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+cucumber --drb $*
+
diff --git a/scripts/test b/scripts/test
new file mode 100755
index 0000000..b5dea77
--- /dev/null
+++ b/scripts/test
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+need_rails=1
+
+if [ $# -gt 0 ]; then # we have args
+    filename=$1
+    # Remove trailing line numbers from filename, e.g. spec/my_spec.rb:33
+    grep_filename=`echo $1 | sed 's/:.*$//g'`
+
+    (set +e; grep -r 'spec_helper' $grep_filename) > /dev/null
+    if [ $? -eq 1 ]; then # no match; we have a stand-alone spec
+        need_rails=''
+    fi
+else # we have no args
+    filename='spec'
+fi
+
+command='rspec'
+
+if [ $need_rails ]; then
+command="ruby -S bundle exec $command --drb"
+fi
+
+RAILS_ENV=test $command $filename
+
diff --git a/scripts/test.sh b/scripts/test.sh
deleted file mode 100644
index 75ab3f0..0000000
--- a/scripts/test.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# From Destroy All Software screencast #10, at:
-# http://destroyallsoftware.com/screencasts/catalog/fast-tests-with-and-without-rails
-#
-# Released under the MIT license: http://opensource.org/licenses/MIT
-#
-# Put this in the script/ directory of your Rails app, then run it with a spec
-# filename. If the spec uses spec_helper, it'll be run inside Bundler.
-# Otherwise, it'll be run directly with whatever `rspec` executable is on the
-# path.
-
-set -e
-
-need_rails=1
-
-if [ $# -gt 0 ]; then # we have args
-    filename=$1
-    # Remove trailing line numbers from filename, e.g. spec/my_spec.rb:33
-    grep_filename=`echo $1 | sed 's/:.*$//g'`
-
-    (set +e; grep -r '\bspec_helper\b' $grep_filename) > /dev/null
-    if [ $? -eq 1 ]; then # no match; we have a stand-alone spec
-        need_rails=''
-    fi
-else # we have no args
-    filename='spec'
-fi
-
-command='rspec'
-
-if [ $need_rails ]; then
-    command="ruby -S bundle exec $command"
-fi
-
-RAILS_ENV=test $command $filename
\ No newline at end of file