diff --git a/.gitignore b/.gitignore
index 27bdad0..cbf20f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-build_tests_run
+build_test_run
diff --git a/Rakefile.rb b/Rakefile.rb
index cebe9b2..a4aaf1e 100644
--- a/Rakefile.rb
+++ b/Rakefile.rb
@@ -10,21 +10,12 @@ require "rspec/core/rake_task"
 require "rake/clean"
 require "yard"
 
-CLEAN.include 'build_tests_run'
+CLEAN.include 'build_test_run'
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = "--default-path spec"
-end
-
-RSpec::Core::RakeTask.new(:build_tests) do |task|
-  task.rspec_opts = "--default-path build_tests"
-  task.pattern = "build_tests/*_spec.rb"
-end
+RSpec::Core::RakeTask.new(:spec)
 
 YARD::Rake::YardocTask.new do |yard|
   yard.files = ['lib/**/*.rb']
 end
 
 task :default => :spec
-
-task :tests => [:spec, :build_tests]
diff --git a/build_tests/spec_helper.rb b/build_tests/spec_helper.rb
deleted file mode 100644
index 46086fe..0000000
--- a/build_tests/spec_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "simplecov"
-
-SimpleCov.start do
-  add_filter "/build_tests/"
-  command_name("build_tests")
-end
-
-require "rscons"
diff --git a/build_tests/build_tests_spec.rb b/spec/build_tests_spec.rb
similarity index 100%
rename from build_tests/build_tests_spec.rb
rename to spec/build_tests_spec.rb