diff --git a/Rakefile b/Rakefile
index adf6d25..5c7268a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,6 +12,7 @@ task :default => :test
 desc 'Test the factory_girl plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
diff --git a/test/aliases_test.rb b/test/aliases_test.rb
index b6c0d50..7ca951a 100644
--- a/test/aliases_test.rb
+++ b/test/aliases_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class AliasesTest < Test::Unit::TestCase
 
diff --git a/test/association_attribute_test.rb b/test/association_attribute_test.rb
index 9d44c6c..0a00efb 100644
--- a/test/association_attribute_test.rb
+++ b/test/association_attribute_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class AssociationAttributeTest < Test::Unit::TestCase
 
diff --git a/test/attribute_test.rb b/test/attribute_test.rb
index a62bb0a..ef9d900 100644
--- a/test/attribute_test.rb
+++ b/test/attribute_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class AttributeTest < Test::Unit::TestCase
 
diff --git a/test/attributes_for_strategy_test.rb b/test/attributes_for_strategy_test.rb
index 56e6a1c..60794fd 100644
--- a/test/attributes_for_strategy_test.rb
+++ b/test/attributes_for_strategy_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class AttributesForProxyTest < Test::Unit::TestCase
 
diff --git a/test/build_strategy_test.rb b/test/build_strategy_test.rb
index d572786..e8114a4 100644
--- a/test/build_strategy_test.rb
+++ b/test/build_strategy_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class BuildProxyTest < Test::Unit::TestCase
 
diff --git a/test/create_strategy_test.rb b/test/create_strategy_test.rb
index 9688215..c67517f 100644
--- a/test/create_strategy_test.rb
+++ b/test/create_strategy_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class CreateProxyTest < Test::Unit::TestCase
 
diff --git a/test/dynamic_attribute_test.rb b/test/dynamic_attribute_test.rb
index 197c776..e69bdbd 100644
--- a/test/dynamic_attribute_test.rb
+++ b/test/dynamic_attribute_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class DynamicAttributeTest < Test::Unit::TestCase
 
diff --git a/test/factory_test.rb b/test/factory_test.rb
index 8ce2966..a3a5abe 100644
--- a/test/factory_test.rb
+++ b/test/factory_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class FactoryTest < Test::Unit::TestCase
 factory = Factory.new(:post)
diff --git a/test/integration_test.rb b/test/integration_test.rb
index b564fdc..559caad 100644
--- a/test/integration_test.rb
+++ b/test/integration_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class IntegrationTest < Test::Unit::TestCase
 
diff --git a/test/sequence_test.rb b/test/sequence_test.rb
index 5f7c525..fd95740 100644
--- a/test/sequence_test.rb
+++ b/test/sequence_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class SequenceTest < Test::Unit::TestCase
 
diff --git a/test/static_attribute_test.rb b/test/static_attribute_test.rb
index 1401348..4d49e37 100644
--- a/test/static_attribute_test.rb
+++ b/test/static_attribute_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class StaticAttributeTest < Test::Unit::TestCase
 
diff --git a/test/strategy_test.rb b/test/strategy_test.rb
index d3cc802..33ec4c2 100644
--- a/test/strategy_test.rb
+++ b/test/strategy_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class Proxy < Test::Unit::TestCase
 
diff --git a/test/stub_strategy_test.rb b/test/stub_strategy_test.rb
index c4e21e7..231540c 100644
--- a/test/stub_strategy_test.rb
+++ b/test/stub_strategy_test.rb
@@ -1,4 +1,4 @@
-require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'test_helper'
 
 class StubProxyTest < Test::Unit::TestCase
   context "the stub proxy" do
diff --git a/test/syntax/blueprint.rb b/test/syntax/blueprint_test.rb
similarity index 100%
rename from test/syntax/blueprint.rb
rename to test/syntax/blueprint_test.rb
diff --git a/test/syntax/make.rb b/test/syntax/make_test.rb
similarity index 100%
rename from test/syntax/make.rb
rename to test/syntax/make_test.rb
diff --git a/test/syntax/sham.rb b/test/syntax/sham_test.rb
similarity index 100%
rename from test/syntax/sham.rb
rename to test/syntax/sham_test.rb