diff --git a/README.md b/README.md
index 93c7a882a..c5fba20e7 100644
--- a/README.md
+++ b/README.md
@@ -59,17 +59,9 @@ To run all specs and all features:
 
 ### Specs
 
-On OSX:
-
-    $ jruby -J-XstartOnFirstThread -S spec plugins/#{plugin_name}/spec/
-
-On Linux/Windows:
-
-    $ jruby -S spec plugins/#{plugin_name}/spec/
-
-To just run all specs:
+To run all specs:
 
-   $ rake specs  
+   $ rspec plugins/*/spec/
 
 ### Features
 
diff --git a/Rakefile b/Rakefile
index 2b829aefb..cdecfb3c9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,8 @@
 require 'bundler'
-REDCAR_VERSION = "0.12.0dev" # also change in lib/redcar.rb!
 require 'fileutils'
 
-# explitely use rspec < 2.0
-gem 'rspec', '<2.0'
-require 'spec/rake/spectask'
 require 'cucumber/rake/task'
-require "rake/gempackagetask"
-require "rake/rdoctask"
+
 Dir[File.expand_path("../lib/tasks/*.rake", __FILE__)].each { |f| load f }
 
 if RUBY_PLATFORM =~ /mswin|mingw/
@@ -136,13 +131,8 @@ task :default => ["specs", "cucumber"]
 
 desc "Run all specs"
 task :specs do
-  files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
-  case Config::CONFIG["host_os"]
-  when "darwin"
-    sh("jruby -J-XstartOnFirstThread -S bundle exec spec -c #{files.join(" ")} && echo 'done'")
-  else
-    sh("jruby -S bundle exec spec -c #{files.join(" ")} && echo 'done'")
-  end
+  plugin_spec_dirs = Dir["plugins/*/spec"]
+  sh("jruby -S bundle exec rspec -c #{plugin_spec_dirs.join(" ")}")
 end
 
 desc "Run all features"
@@ -191,28 +181,6 @@ task :run_ci do
   contrl.run
 end
 
-desc "Release gem"
-task :release => :gem do
-  require 'aws/s3'
-  credentials = YAML.load(File.read("/Users/danlucraft/.s3-creds.yaml"))
-  AWS::S3::Base.establish_connection!(
-    :access_key_id     => credentials['access_key_id'],
-    :secret_access_key => credentials["secret_access_key"]
-  )
-  
-  redcar_bucket = AWS::S3::Bucket.find('redcar')
-  s3_uploads = {
-    "vendor/java-mateview/release/java-mateview.jar" => "java-mateview-#{REDCAR_VERSION}.jar",
-    "plugins/application_swt/lib/dist/application_swt.jar"   => "application_swt-#{REDCAR_VERSION}.jar",
-    "pkg/redcar-#{REDCAR_VERSION}.gem"                       => "redcar-#{REDCAR_VERSION}.gem"
-  }
-  
-  s3_uploads.each do |source, target|
-    p [source, target]
-    AWS::S3::S3Object.store(target, open(source), 'redcar', :access => :public_read)
-  end
-end
-
 namespace :redcar do
   def hash_with_hash_default
     Hash.new {|h,k| h[k] = hash_with_hash_default }
diff --git a/lib/redcar.rb b/lib/redcar.rb
index 55a61a4b0..79a320e74 100644
--- a/lib/redcar.rb
+++ b/lib/redcar.rb
@@ -109,7 +109,7 @@ def self.add_plugin_sources(manager)
     end
   end
 
-  def self.load_prerequisites
+  def self.load_prerequisites(options={})
     exit if ARGV.include?("--quit-immediately")
     require 'java'
     
@@ -130,18 +130,17 @@ def self.load_prerequisites
     
     gem 'swt'
     require 'swt/minimal'
+      
+    unless no_gui_mode?
+      gui = Redcar::Gui.new("swt")
+      gui.register_event_loop(Swt::EventLoop.new)
+      gui.register_features_runner(Swt::CucumberRunner.new)
+      Redcar.gui = gui
     
-    gui = Redcar::Gui.new("swt")
-    gui.register_event_loop(Swt::EventLoop.new)
-    gui.register_features_runner(Swt::CucumberRunner.new)
-    Redcar.gui = gui
-    
-    plugin_manager.load("splash_screen")
+      plugin_manager.load("splash_screen")
+    end
   end
   
-  def self.load_useful_libraries
-  end
-
   def self.load_plugins
     begin
       exit if ARGV.include?("--quit-after-splash")
@@ -177,8 +176,8 @@ def self.load_threaded
     end
   end
   
-  def self.load_unthreaded
-    load_prerequisites
+  def self.load_unthreaded(options={})
+    load_prerequisites(options)
     load_plugins
   end
   
diff --git a/plugins/application/spec/application/application_spec.rb b/plugins/application/spec/application/application_spec.rb
index 4c1a3da12..c7de6db9c 100644
--- a/plugins/application/spec/application/application_spec.rb
+++ b/plugins/application/spec/application/application_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Application do
   it "has a name" do
diff --git a/plugins/application/spec/application/clipboard_spec.rb b/plugins/application/spec/application/clipboard_spec.rb
index f86c5fef0..8c2b48c82 100644
--- a/plugins/application/spec/application/clipboard_spec.rb
+++ b/plugins/application/spec/application/clipboard_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Clipboard do
   before do
diff --git a/plugins/application/spec/application/command/executor_spec.rb b/plugins/application/spec/application/command/executor_spec.rb
index 413160da0..1bd00bda6 100644
--- a/plugins/application/spec/application/command/executor_spec.rb
+++ b/plugins/application/spec/application/command/executor_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 class Redcar::Command
   describe Executor do
diff --git a/plugins/application/spec/application/command/history_spec.rb b/plugins/application/spec/application/command/history_spec.rb
index b5806c11f..6d563fc37 100644
--- a/plugins/application/spec/application/command/history_spec.rb
+++ b/plugins/application/spec/application/command/history_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Command::History do
   class HistoryTestCommand1 < Redcar::Command
diff --git a/plugins/application/spec/application/command_spec.rb b/plugins/application/spec/application/command_spec.rb
index c8a3dff96..3f26b68df 100644
--- a/plugins/application/spec/application/command_spec.rb
+++ b/plugins/application/spec/application/command_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Command do
   describe "a command" do
diff --git a/plugins/application/spec/application/keymap/builder_spec.rb b/plugins/application/spec/application/keymap/builder_spec.rb
index bb83c2af9..b3040d58b 100644
--- a/plugins/application/spec/application/keymap/builder_spec.rb
+++ b/plugins/application/spec/application/keymap/builder_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe "Redcar::Keymap::Builder DSL" do
   it "creates a keymap" do
diff --git a/plugins/application/spec/application/menu/builder_spec.rb b/plugins/application/spec/application/menu/builder_spec.rb
index 7d16e7608..362d77f7b 100644
--- a/plugins/application/spec/application/menu/builder_spec.rb
+++ b/plugins/application/spec/application/menu/builder_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe "Redcar::Menu::Builder DSL" do
   it "creates a menu" do
diff --git a/plugins/application/spec/application/menu/menu_item_spec.rb b/plugins/application/spec/application/menu/menu_item_spec.rb
index 4c587e6c1..689b8d928 100644
--- a/plugins/application/spec/application/menu/menu_item_spec.rb
+++ b/plugins/application/spec/application/menu/menu_item_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Menu::Item do
   class DummyCommand; end
diff --git a/plugins/application/spec/application/menu_spec.rb b/plugins/application/spec/application/menu_spec.rb
index 172fe80f1..3dbc41ee6 100644
--- a/plugins/application/spec/application/menu_spec.rb
+++ b/plugins/application/spec/application/menu_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Menu do
   class DummyCommand; end
diff --git a/plugins/application/spec/application/navigation_history_spec.rb b/plugins/application/spec/application/navigation_history_spec.rb
index a13552093..75e5bd1eb 100644
--- a/plugins/application/spec/application/navigation_history_spec.rb
+++ b/plugins/application/spec/application/navigation_history_spec.rb
@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe Redcar::NavigationHistory do
   module NavigationHistoryTest
     class TestEditView
diff --git a/plugins/application/spec/application/notebook_spec.rb b/plugins/application/spec/application/notebook_spec.rb
index 9d90ba6cf..dee9d2c87 100644
--- a/plugins/application/spec/application/notebook_spec.rb
+++ b/plugins/application/spec/application/notebook_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Notebook do
   describe "with no tabs" do
diff --git a/plugins/application/spec/application/sensitive_spec.rb b/plugins/application/spec/application/sensitive_spec.rb
index 7814dfba6..19aedb9d5 100644
--- a/plugins/application/spec/application/sensitive_spec.rb
+++ b/plugins/application/spec/application/sensitive_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Sensitive do
   class ExampleModel
diff --git a/plugins/application/spec/application/speedbar_spec.rb b/plugins/application/spec/application/speedbar_spec.rb
index cbfc2b8bd..bf6272e2a 100644
--- a/plugins/application/spec/application/speedbar_spec.rb
+++ b/plugins/application/spec/application/speedbar_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Speedbar do
   it "should let you add labels" do
diff --git a/plugins/application/spec/application/treebook_spec.rb b/plugins/application/spec/application/treebook_spec.rb
index 8473c2854..f1230774b 100644
--- a/plugins/application/spec/application/treebook_spec.rb
+++ b/plugins/application/spec/application/treebook_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Treebook do
 
diff --git a/plugins/application/spec/application/window_spec.rb b/plugins/application/spec/application/window_spec.rb
index 048b64427..e22612d7a 100644
--- a/plugins/application/spec/application/window_spec.rb
+++ b/plugins/application/spec/application/window_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Window do
   
diff --git a/plugins/application/spec/spec_helper.rb b/plugins/application/spec/spec_helper.rb
index a08a7701f..5418e6813 100644
--- a/plugins/application/spec/spec_helper.rb
+++ b/plugins/application/spec/spec_helper.rb
@@ -1,8 +1,4 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-require 'redcar'
-Redcar.environment = :test
-Redcar.no_gui_mode!
-Redcar.load_unthreaded
+
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn
 end
@@ -15,4 +11,6 @@ def initialize(title)
   end
 
   def focus; end
-end
\ No newline at end of file
+end
+
+Redcar.plugin_manager.load("application")
\ No newline at end of file
diff --git a/plugins/application_swt/spec/application_swt/gradient_spec.rb b/plugins/application_swt/spec/application_swt/gradient_spec.rb
index 72ef4a70b..1836e2811 100644
--- a/plugins/application_swt/spec/application_swt/gradient_spec.rb
+++ b/plugins/application_swt/spec/application_swt/gradient_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::ApplicationSWT::Gradient do
   
diff --git a/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb b/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb
index 8bcf6970c..a6e894649 100644
--- a/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb
+++ b/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 BindingTranslator = Redcar::ApplicationSWT::Menu::BindingTranslator
 describe BindingTranslator do
diff --git a/plugins/application_swt/spec/application_swt/menu_spec.rb b/plugins/application_swt/spec/application_swt/menu_spec.rb
index 9d908df78..dae670fb7 100644
--- a/plugins/application_swt/spec/application_swt/menu_spec.rb
+++ b/plugins/application_swt/spec/application_swt/menu_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::ApplicationSWT::Menu do
   it "should" do
diff --git a/plugins/application_swt/spec/spec_helper.rb b/plugins/application_swt/spec/spec_helper.rb
index f86d62715..12ae0fee6 100644
--- a/plugins/application_swt/spec/spec_helper.rb
+++ b/plugins/application_swt/spec/spec_helper.rb
@@ -1,20 +1,2 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
-
-Spec::Runner.configure do |config|
-  config.before(:suite) do
-  end
-
-  config.before(:each) do
-  end
-
-  config.after(:each) do
-  end
-
-  config.after(:suite) do
-  end
-end
 
+Redcar.plugin_manager.load("application_swt")
\ No newline at end of file
diff --git a/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb b/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb
index d0f5451bc..535eb9c6a 100644
--- a/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb
+++ b/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 include Redcar
 
diff --git a/plugins/auto_indenter/spec/spec_helper.rb b/plugins/auto_indenter/spec/spec_helper.rb
index 77048795e..ef793ef5c 100644
--- a/plugins/auto_indenter/spec/spec_helper.rb
+++ b/plugins/auto_indenter/spec/spec_helper.rb
@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("auto_indenter")
\ No newline at end of file
diff --git a/plugins/core/spec/core/base_storage_spec.rb b/plugins/core/spec/core/base_storage_spec.rb
index 98c7e7ec4..14ecc3677 100644
--- a/plugins/core/spec/core/base_storage_spec.rb
+++ b/plugins/core/spec/core/base_storage_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Plugin::BaseStorage do
   
diff --git a/plugins/core/spec/core/gui_spec.rb b/plugins/core/spec/core/gui_spec.rb
index a2fda4b1a..a89e0a235 100644
--- a/plugins/core/spec/core/gui_spec.rb
+++ b/plugins/core/spec/core/gui_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Gui do
   before do
diff --git a/plugins/core/spec/core/observable_spec.rb b/plugins/core/spec/core/observable_spec.rb
index 5be6785cc..2b0b1f933 100644
--- a/plugins/core/spec/core/observable_spec.rb
+++ b/plugins/core/spec/core/observable_spec.rb
@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+require "spec_helper"
 
 describe Redcar::Observable do
   class SeeMe
diff --git a/plugins/core/spec/core/persistent_cache_spec.rb b/plugins/core/spec/core/persistent_cache_spec.rb
index ee885b960..d9ed7e142 100644
--- a/plugins/core/spec/core/persistent_cache_spec.rb
+++ b/plugins/core/spec/core/persistent_cache_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), *%w".. .. lib core persistent_cache")
+require "spec_helper"
 
 PersistentCache = Redcar::PersistentCache
 
diff --git a/plugins/core/spec/core/shared_storage_spec.rb b/plugins/core/spec/core/shared_storage_spec.rb
index a4329147f..908fb3c1a 100644
--- a/plugins/core/spec/core/shared_storage_spec.rb
+++ b/plugins/core/spec/core/shared_storage_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Plugin::SharedStorage do
   
diff --git a/plugins/core/spec/core/storage_spec.rb b/plugins/core/spec/core/storage_spec.rb
index 740269994..e9a3056c0 100644
--- a/plugins/core/spec/core/storage_spec.rb
+++ b/plugins/core/spec/core/storage_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Plugin::Storage do
   
diff --git a/plugins/core/spec/core/task_queue_spec.rb b/plugins/core/spec/core/task_queue_spec.rb
index 222bff795..f294e69ab 100644
--- a/plugins/core/spec/core/task_queue_spec.rb
+++ b/plugins/core/spec/core/task_queue_spec.rb
@@ -1,7 +1,5 @@
 
-require 'java'
-
-require File.join(File.dirname(__FILE__), *%w".. spec_helper")
+require "spec_helper"
 
 describe Redcar::TaskQueue do
   before do
diff --git a/plugins/core/spec/spec_helper.rb b/plugins/core/spec/spec_helper.rb
index 52a5b49c2..fc6bc1769 100644
--- a/plugins/core/spec/spec_helper.rb
+++ b/plugins/core/spec/spec_helper.rb
@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("core")
 
 class QuickTask < Redcar::Task
   def initialize(id=nil)
diff --git a/plugins/declarations/spec/declarations/file_spec.rb b/plugins/declarations/spec/declarations/file_spec.rb
index f1b0b4869..b7ada6f6a 100644
--- a/plugins/declarations/spec/declarations/file_spec.rb
+++ b/plugins/declarations/spec/declarations/file_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 module Redcar
   describe Declarations::File do
diff --git a/plugins/declarations/spec/spec_helper.rb b/plugins/declarations/spec/spec_helper.rb
index 77048795e..6aeeca066 100644
--- a/plugins/declarations/spec/spec_helper.rb
+++ b/plugins/declarations/spec/spec_helper.rb
@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("declarations")
\ No newline at end of file
diff --git a/plugins/edit_view/spec/edit_view/document/indentation_spec.rb b/plugins/edit_view/spec/edit_view/document/indentation_spec.rb
index 63b8ce874..7bf69d9b1 100644
--- a/plugins/edit_view/spec/edit_view/document/indentation_spec.rb
+++ b/plugins/edit_view/spec/edit_view/document/indentation_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), %w".. .. spec_helper")
+require "spec_helper"
 
 describe Redcar::Document::Indentation do
   class MockDoc
diff --git a/plugins/edit_view/spec/edit_view/document_spec.rb b/plugins/edit_view/spec/edit_view/document_spec.rb
index b7df86138..a9e5da510 100644
--- a/plugins/edit_view/spec/edit_view/document_spec.rb
+++ b/plugins/edit_view/spec/edit_view/document_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Document do
   class TestEditView
diff --git a/plugins/edit_view/spec/spec_helper.rb b/plugins/edit_view/spec/spec_helper.rb
index 77048795e..813ce5fec 100644
--- a/plugins/edit_view/spec/spec_helper.rb
+++ b/plugins/edit_view/spec/spec_helper.rb
@@ -1,5 +1,2 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("edit_view")
\ No newline at end of file
diff --git a/plugins/edit_view_swt/spec/edit_view_swt/word_movement_spec.rb b/plugins/edit_view_swt/spec/edit_view_swt/word_movement_spec.rb
index b94cbaaf3..bbf4350e6 100644
--- a/plugins/edit_view_swt/spec/edit_view_swt/word_movement_spec.rb
+++ b/plugins/edit_view_swt/spec/edit_view_swt/word_movement_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::EditViewSWT::WordMoveListener do
   before do
diff --git a/plugins/edit_view_swt/spec/spec_helper.rb b/plugins/edit_view_swt/spec/spec_helper.rb
index 77048795e..a65ac9af8 100644
--- a/plugins/edit_view_swt/spec/spec_helper.rb
+++ b/plugins/edit_view_swt/spec/spec_helper.rb
@@ -1,5 +1,2 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("edit_view_swt")
\ No newline at end of file
diff --git a/plugins/macros/spec/macros/predictive/sequence_finder_spec.rb b/plugins/macros/spec/macros/predictive/sequence_finder_spec.rb
index 1a2520ee4..6c6c221eb 100644
--- a/plugins/macros/spec/macros/predictive/sequence_finder_spec.rb
+++ b/plugins/macros/spec/macros/predictive/sequence_finder_spec.rb
@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require "spec_helper"
 
 describe Redcar::Macros::Predictive::SequenceFinder do
   SequenceFinder = Redcar::Macros::Predictive::SequenceFinder
diff --git a/plugins/macros/spec/spec_helper.rb b/plugins/macros/spec/spec_helper.rb
index 6a6d53397..1a1dbf065 100644
--- a/plugins/macros/spec/spec_helper.rb
+++ b/plugins/macros/spec/spec_helper.rb
@@ -1,6 +1 @@
-
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-require 'redcar'
-Redcar.environment = :test
-Redcar.no_gui_mode!
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("macros")
\ No newline at end of file
diff --git a/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb b/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb
index 912483f7c..96942c52f 100644
--- a/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb
+++ b/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
+require "spec_helper"
 
 require 'net/ssh'
 require 'net/ftp'
diff --git a/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb b/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb
index 83f1824c6..75aa3787e 100644
--- a/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb
+++ b/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
+require "spec_helper"
 
 require 'net/ssh'
 require 'net/sftp'
diff --git a/plugins/project/spec/project/adapters/remote_spec.rb b/plugins/project/spec/project/adapters/remote_spec.rb
index 5a1fd6f71..95928f134 100644
--- a/plugins/project/spec/project/adapters/remote_spec.rb
+++ b/plugins/project/spec/project/adapters/remote_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 class Redcar::Project
   # describe Adapters::Remote do
diff --git a/plugins/project/spec/project/dir_mirror_spec.rb b/plugins/project/spec/project/dir_mirror_spec.rb
index b0b334304..1fc282825 100644
--- a/plugins/project/spec/project/dir_mirror_spec.rb
+++ b/plugins/project/spec/project/dir_mirror_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 class Redcar::Project
   describe DirMirror do
diff --git a/plugins/project/spec/project/file_list_spec.rb b/plugins/project/spec/project/file_list_spec.rb
index 460142610..3b96a37f4 100644
--- a/plugins/project/spec/project/file_list_spec.rb
+++ b/plugins/project/spec/project/file_list_spec.rb
@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), *%w".. spec_helper")
+require "spec_helper"
 
 FileList = Redcar::Project::FileList
 
diff --git a/plugins/project/spec/project/file_mirror_spec.rb b/plugins/project/spec/project/file_mirror_spec.rb
index e14e73338..52d4e3172 100644
--- a/plugins/project/spec/project/file_mirror_spec.rb
+++ b/plugins/project/spec/project/file_mirror_spec.rb
@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+require "spec_helper"
 
 class Redcar::Project
   describe FileMirror do
diff --git a/plugins/project/spec/spec_helper.rb b/plugins/project/spec/spec_helper.rb
index 67a130471..b55571c50 100644
--- a/plugins/project/spec/spec_helper.rb
+++ b/plugins/project/spec/spec_helper.rb
@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("project")
 
 require File.dirname(__FILE__) + "/fixture_helper"
 
diff --git a/plugins/project_search/spec/project_search/binary_data_detector_spec.rb b/plugins/project_search/spec/project_search/binary_data_detector_spec.rb
index 90eb84340..92fe63919 100644
--- a/plugins/project_search/spec/project_search/binary_data_detector_spec.rb
+++ b/plugins/project_search/spec/project_search/binary_data_detector_spec.rb
@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe ProjectSearch::BinaryDataDetector do
   
diff --git a/plugins/project_search/spec/project_search/word_search_spec.rb b/plugins/project_search/spec/project_search/word_search_spec.rb
index 3ed1cf3d8..725d8ce95 100644
--- a/plugins/project_search/spec/project_search/word_search_spec.rb
+++ b/plugins/project_search/spec/project_search/word_search_spec.rb
@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe ProjectSearch::WordSearch do
   after do
diff --git a/plugins/project_search/spec/spec_helper.rb b/plugins/project_search/spec/spec_helper.rb
index 4df97995e..7e9b91a94 100644
--- a/plugins/project_search/spec/spec_helper.rb
+++ b/plugins/project_search/spec/spec_helper.rb
@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("project_search")
 
 class ImmediateTaskQueue
   class Future
diff --git a/plugins/repl/spec/repl/repl_mirror_spec.rb b/plugins/repl/spec/repl/repl_mirror_spec.rb
index 613fa2104..700cbf6d4 100644
--- a/plugins/repl/spec/repl/repl_mirror_spec.rb
+++ b/plugins/repl/spec/repl/repl_mirror_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 class Redcar::REPL
   describe ReplMirror do
diff --git a/plugins/repl/spec/spec_helper.rb b/plugins/repl/spec/spec_helper.rb
index 3ed4b23c9..fa14592cb 100644
--- a/plugins/repl/spec/spec_helper.rb
+++ b/plugins/repl/spec/spec_helper.rb
@@ -1,5 +1,2 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
\ No newline at end of file
+Redcar.plugin_manager.load("repl")
\ No newline at end of file
diff --git a/plugins/ruby/spec/ruby/repl_mirror_spec.rb b/plugins/ruby/spec/ruby/repl_mirror_spec.rb
index fad83fe3f..3512978ed 100644
--- a/plugins/ruby/spec/ruby/repl_mirror_spec.rb
+++ b/plugins/ruby/spec/ruby/repl_mirror_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 class Redcar::Ruby
   describe ReplMirror do
diff --git a/plugins/ruby/spec/spec_helper.rb b/plugins/ruby/spec/spec_helper.rb
index 3ed4b23c9..6d78edfad 100644
--- a/plugins/ruby/spec/spec_helper.rb
+++ b/plugins/ruby/spec/spec_helper.rb
@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
\ No newline at end of file
+Redcar.plugin_manager.load("ruby")
\ No newline at end of file
diff --git a/plugins/runnables/spec/runnables/output_processor_spec.rb b/plugins/runnables/spec/runnables/output_processor_spec.rb
index f8b5f6ccc..d63000296 100644
--- a/plugins/runnables/spec/runnables/output_processor_spec.rb
+++ b/plugins/runnables/spec/runnables/output_processor_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Redcar::Runnables::OutputProcessor do
   before do
diff --git a/plugins/runnables/spec/spec_helper.rb b/plugins/runnables/spec/spec_helper.rb
index 77048795e..966cb33f9 100644
--- a/plugins/runnables/spec/spec_helper.rb
+++ b/plugins/runnables/spec/spec_helper.rb
@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("runnables")
\ No newline at end of file
diff --git a/plugins/test_runner/spec/spec_helper.rb b/plugins/test_runner/spec/spec_helper.rb
index 77048795e..e6a2ac7e1 100644
--- a/plugins/test_runner/spec/spec_helper.rb
+++ b/plugins/test_runner/spec/spec_helper.rb
@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("test_runner")
\ No newline at end of file
diff --git a/plugins/todo_list/spec/spec_helper.rb b/plugins/todo_list/spec/spec_helper.rb
index 550f751af..87491891e 100644
--- a/plugins/todo_list/spec/spec_helper.rb
+++ b/plugins/todo_list/spec/spec_helper.rb
@@ -1,6 +1,3 @@
-$:.push File.expand_path('../../../../lib', __FILE__)
 require File.expand_path("../fixtures/settings", __FILE__)
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("todo_list")
\ No newline at end of file
diff --git a/plugins/todo_list/spec/todo_list/file_parser_spec.rb b/plugins/todo_list/spec/todo_list/file_parser_spec.rb
index 530615315..19a0d9eb1 100644
--- a/plugins/todo_list/spec/todo_list/file_parser_spec.rb
+++ b/plugins/todo_list/spec/todo_list/file_parser_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
 
 describe Redcar::TodoList::FileParser do
   before do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 000000000..23210d3b9
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,34 @@
+puts "loading master spec_helper"
+
+class RedcarSpecEnvironment
+  def load_core
+    $:.push File.expand_path("../../lib", __FILE__)
+    require 'redcar'
+    Redcar.environment = :test
+    Redcar.no_gui_mode!
+    Redcar.load_prerequisites
+  end
+  
+  def spec_helpers
+    spec_helpers = []
+    RSpec.configuration.files_to_run.each do |spec_file|
+      if spec_file =~ /plugins\/([^\/]+)\//
+        filename = "plugins/#{$1}/spec/spec_helper"
+        if File.exist?(filename + ".rb")
+          spec_helpers << filename unless spec_helpers.include?(filename)
+        end
+      end
+    end
+    spec_helpers
+  end
+end
+
+spec_environment = RedcarSpecEnvironment.new
+spec_environment.load_core
+spec_environment.spec_helpers.each do |spec_helper|
+  puts "loading #{spec_helper}"
+  require spec_helper
+end
+
+
+