--- a/spec/buffer_io_spec.rb
+++ b/spec/buffer_io_spec.rb
@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'random_compat'
+require 'spec/spec_helper'
+require 'spec/random_compat'
 
 require 'stringio'
 if defined?(Encoding)
--- a/spec/buffer_spec.rb
+++ b/spec/buffer_spec.rb
@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'random_compat'
+require 'spec/spec_helper'
+require 'spec/random_compat'
 
 describe Buffer do
   STATIC_EXAMPLES = {}
--- a/spec/cases_spec.rb
+++ b/spec/cases_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 require 'json'
 
 describe MessagePack do
--- a/spec/format_spec.rb
+++ b/spec/format_spec.rb
@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe MessagePack do
   it "nil" do
--- a/spec/packer_spec.rb
+++ b/spec/packer_spec.rb
@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-require 'spec_helper'
+require 'spec/spec_helper'
 
 require 'stringio'
 if defined?(Encoding)
--- a/spec/unpacker_spec.rb
+++ b/spec/unpacker_spec.rb
@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe Unpacker do
   let :unpacker do
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,6 +13,7 @@
   GC.stress = true
 end
 
+require 'rspec'
 require 'msgpack'
 
 Packer = MessagePack::Packer
