diff --git a/lib/capistrano/shell.rb b/lib/capistrano/shell.rb
index 442b1350..ea8346ea 100644
--- a/lib/capistrano/shell.rb
+++ b/lib/capistrano/shell.rb
@@ -1,5 +1,5 @@
 require 'thread'
-require 'capistrano/command'
+require 'capistrano/processable'
 
 module Capistrano
   # The Capistrano::Shell class is the guts of the "shell" task. It implements
@@ -7,7 +7,7 @@ module Capistrano
   # commands. It makes for a GREAT way to monitor systems, and perform quick
   # maintenance on one or more machines.
   class Shell
-    include Command::Processable
+    include Processable
 
     # A Readline replacement for platforms where readline is either
     # unavailable, or has not been installed.
diff --git a/test/cli/execute_test.rb b/test/cli/execute_test.rb
index 42f75c5e..337f64fa 100644
--- a/test/cli/execute_test.rb
+++ b/test/cli/execute_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/execute'
 
 class CLIExecuteTest < Test::Unit::TestCase
diff --git a/test/cli/help_test.rb b/test/cli/help_test.rb
index 679ff941..1ee19cf0 100644
--- a/test/cli/help_test.rb
+++ b/test/cli/help_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/help'
 
 class CLIHelpTest < Test::Unit::TestCase
diff --git a/test/cli/options_test.rb b/test/cli/options_test.rb
index b5b8328e..44c3613d 100644
--- a/test/cli/options_test.rb
+++ b/test/cli/options_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/options'
 
 class CLIOptionsTest < Test::Unit::TestCase
diff --git a/test/cli/ui_test.rb b/test/cli/ui_test.rb
index 9bd343ac..1999af6e 100644
--- a/test/cli/ui_test.rb
+++ b/test/cli/ui_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/ui'
 
 class CLIUITest < Test::Unit::TestCase
diff --git a/test/cli_test.rb b/test/cli_test.rb
index 49e5b2e0..f8de20e2 100644
--- a/test/cli_test.rb
+++ b/test/cli_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/cli'
 
 class CLI_Test < Test::Unit::TestCase
diff --git a/test/command_test.rb b/test/command_test.rb
index cff6bd97..67ded656 100644
--- a/test/command_test.rb
+++ b/test/command_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/command'
 
 class CommandTest < Test::Unit::TestCase
diff --git a/test/configuration/actions/file_transfer_test.rb b/test/configuration/actions/file_transfer_test.rb
index a8294d40..a993fa12 100644
--- a/test/configuration/actions/file_transfer_test.rb
+++ b/test/configuration/actions/file_transfer_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/configuration/actions/file_transfer'
 
 class ConfigurationActionsFileTransferTest < Test::Unit::TestCase
diff --git a/test/configuration/actions/inspect_test.rb b/test/configuration/actions/inspect_test.rb
index c872c8be..c5928d5d 100644
--- a/test/configuration/actions/inspect_test.rb
+++ b/test/configuration/actions/inspect_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/configuration/actions/inspect'
 
 class ConfigurationActionsInspectTest < Test::Unit::TestCase
diff --git a/test/configuration/actions/invocation_test.rb b/test/configuration/actions/invocation_test.rb
index 7c2b0326..b260d29a 100644
--- a/test/configuration/actions/invocation_test.rb
+++ b/test/configuration/actions/invocation_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/configuration/actions/invocation'
 
 class ConfigurationActionsInvocationTest < Test::Unit::TestCase
diff --git a/test/configuration/callbacks_test.rb b/test/configuration/callbacks_test.rb
index 7d312366..56ca47d3 100644
--- a/test/configuration/callbacks_test.rb
+++ b/test/configuration/callbacks_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/callbacks'
 
 class ConfigurationCallbacksTest < Test::Unit::TestCase
diff --git a/test/configuration/connections_test.rb b/test/configuration/connections_test.rb
index 23d4a153..67aa6ba7 100644
--- a/test/configuration/connections_test.rb
+++ b/test/configuration/connections_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/connections'
 
 class ConfigurationConnectionsTest < Test::Unit::TestCase
diff --git a/test/configuration/execution_test.rb b/test/configuration/execution_test.rb
index e17db420..a770af8d 100644
--- a/test/configuration/execution_test.rb
+++ b/test/configuration/execution_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/execution'
 require 'capistrano/task_definition'
 
diff --git a/test/configuration/loading_test.rb b/test/configuration/loading_test.rb
index f1ab856e..35cf96ed 100644
--- a/test/configuration/loading_test.rb
+++ b/test/configuration/loading_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/loading'
 
 class ConfigurationLoadingTest < Test::Unit::TestCase
diff --git a/test/configuration/namespace_dsl_test.rb b/test/configuration/namespace_dsl_test.rb
index 26f526c3..517ed6f1 100644
--- a/test/configuration/namespace_dsl_test.rb
+++ b/test/configuration/namespace_dsl_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/namespaces'
 
 class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
diff --git a/test/configuration/roles_test.rb b/test/configuration/roles_test.rb
index fe6c05ae..216f45b4 100644
--- a/test/configuration/roles_test.rb
+++ b/test/configuration/roles_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/roles'
 require 'capistrano/server_definition'
 
diff --git a/test/configuration/servers_test.rb b/test/configuration/servers_test.rb
index b914beae..600e3459 100644
--- a/test/configuration/servers_test.rb
+++ b/test/configuration/servers_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/task_definition'
 require 'capistrano/configuration/servers'
 
diff --git a/test/configuration/variables_test.rb b/test/configuration/variables_test.rb
index d9664b3c..05b3abd9 100644
--- a/test/configuration/variables_test.rb
+++ b/test/configuration/variables_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/variables'
 
 class ConfigurationVariablesTest < Test::Unit::TestCase
diff --git a/test/configuration_test.rb b/test/configuration_test.rb
index c37b4284..74bbb269 100644
--- a/test/configuration_test.rb
+++ b/test/configuration_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/configuration'
 
 # These tests are only for testing the integration of the various components
diff --git a/test/deploy/scm/accurev_test.rb b/test/deploy/scm/accurev_test.rb
index 2bfc5ff7..7ff6a8e2 100644
--- a/test/deploy/scm/accurev_test.rb
+++ b/test/deploy/scm/accurev_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/accurev'
 
 class AccurevTest < Test::Unit::TestCase
diff --git a/test/deploy/scm/base_test.rb b/test/deploy/scm/base_test.rb
index ac272e2c..a4431056 100644
--- a/test/deploy/scm/base_test.rb
+++ b/test/deploy/scm/base_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/base'
 
 class DeploySCMBaseTest < Test::Unit::TestCase
diff --git a/test/deploy/scm/git_test.rb b/test/deploy/scm/git_test.rb
index 5d410a72..896233c0 100644
--- a/test/deploy/scm/git_test.rb
+++ b/test/deploy/scm/git_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/git'
 
 class DeploySCMGitTest < Test::Unit::TestCase
diff --git a/test/deploy/scm/mercurial_test.rb b/test/deploy/scm/mercurial_test.rb
index 83ab936c..73c38228 100644
--- a/test/deploy/scm/mercurial_test.rb
+++ b/test/deploy/scm/mercurial_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/mercurial'
 
 class DeploySCMMercurialTest < Test::Unit::TestCase
diff --git a/test/deploy/strategy/copy_test.rb b/test/deploy/strategy/copy_test.rb
index 846c55ce..7566bca7 100644
--- a/test/deploy/strategy/copy_test.rb
+++ b/test/deploy/strategy/copy_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/logger'
 require 'capistrano/recipes/deploy/strategy/copy'
 require 'stringio'
diff --git a/test/extensions_test.rb b/test/extensions_test.rb
index f6be7b16..88992cda 100644
--- a/test/extensions_test.rb
+++ b/test/extensions_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano'
 
 class ExtensionsTest < Test::Unit::TestCase
diff --git a/test/logger_test.rb b/test/logger_test.rb
index 0fa17212..9fac17d1 100644
--- a/test/logger_test.rb
+++ b/test/logger_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/logger'
 require 'stringio'
 
diff --git a/test/server_definition_test.rb b/test/server_definition_test.rb
index 068f20b6..3e760529 100644
--- a/test/server_definition_test.rb
+++ b/test/server_definition_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/server_definition'
 
 class ServerDefinitionTest < Test::Unit::TestCase
diff --git a/test/shell_test.rb b/test/shell_test.rb
index e877e113..f46f4e50 100644
--- a/test/shell_test.rb
+++ b/test/shell_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/configuration'
 require 'capistrano/shell'
 
diff --git a/test/ssh_test.rb b/test/ssh_test.rb
index 84276f29..f501f441 100644
--- a/test/ssh_test.rb
+++ b/test/ssh_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/ssh'
 
 class SSHTest < Test::Unit::TestCase
diff --git a/test/task_definition_test.rb b/test/task_definition_test.rb
index 3e0a1b1b..d89f9773 100644
--- a/test/task_definition_test.rb
+++ b/test/task_definition_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/task_definition'
 
 class TaskDefinitionTest < Test::Unit::TestCase
diff --git a/test/upload_test.rb b/test/upload_test.rb
index ccc6efc6..d6aeb0b4 100644
--- a/test/upload_test.rb
+++ b/test/upload_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/upload'
 
 class UploadTest < Test::Unit::TestCase
diff --git a/test/utils.rb b/test/utils.rb
index 3287b681..857b7378 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -1,42 +1,38 @@
-unless defined?(TestExtensions)
-  $:.unshift "#{File.dirname(__FILE__)}/../lib"
+begin
+  require 'rubygems'
+  gem     'mocha'
+rescue LoadError
+end
 
-  begin
-    require 'rubygems'
-    gem     'mocha'
-  rescue LoadError
+require 'test/unit'
+require 'mocha'
+require 'capistrano/server_definition'
+
+module TestExtensions
+  def server(host, options={})
+    Capistrano::ServerDefinition.new(host, options)
   end
 
-  require 'test/unit'
-  require 'mocha'
-  require 'capistrano/server_definition'
-
-  module TestExtensions
-    def server(host, options={})
-      Capistrano::ServerDefinition.new(host, options)
-    end
-
-    def namespace(fqn=nil)
-      space = stub(:roles => {}, :fully_qualified_name => fqn, :default_task => nil)
-      yield(space) if block_given?
-      space
-    end
-
-    def role(space, name, *args)
-      opts = args.last.is_a?(Hash) ? args.pop : {}
-      space.roles[name] ||= []
-      space.roles[name].concat(args.map { |h| Capistrano::ServerDefinition.new(h, opts) })
-    end
-
-    def new_task(name, namespace=@namespace, options={}, &block)
-      block ||= Proc.new {}
-      task = Capistrano::TaskDefinition.new(name, namespace, options, &block)
-      assert_equal block, task.body
-      return task
-    end
+  def namespace(fqn=nil)
+    space = stub(:roles => {}, :fully_qualified_name => fqn, :default_task => nil)
+    yield(space) if block_given?
+    space
   end
 
-  class Test::Unit::TestCase
-    include TestExtensions
+  def role(space, name, *args)
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    space.roles[name] ||= []
+    space.roles[name].concat(args.map { |h| Capistrano::ServerDefinition.new(h, opts) })
+  end
+
+  def new_task(name, namespace=@namespace, options={}, &block)
+    block ||= Proc.new {}
+    task = Capistrano::TaskDefinition.new(name, namespace, options, &block)
+    assert_equal block, task.body
+    return task
   end
 end
+
+class Test::Unit::TestCase
+  include TestExtensions
+end
diff --git a/test/version_test.rb b/test/version_test.rb
index 2102a6aa..7d49cd67 100644
--- a/test/version_test.rb
+++ b/test/version_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/version'
 
 class VersionTest < Test::Unit::TestCase