diff --git a/spec/code_spec.rb b/spec/code_spec.rb
index b3440a76..fe0c8b18 100644
--- a/spec/code_spec.rb
+++ b/spec/code_spec.rb
@@ -2,46 +2,46 @@ require_relative 'helper'
 
 describe Pry::Code do
   describe '.from_file' do
-    should 'read lines from a file on disk' do
+    specify 'read lines from a file on disk' do
       Pry::Code.from_file('lib/pry.rb').length.should > 0
     end
 
-    should 'read lines from Pry\'s line buffer' do
+    specify 'read lines from Pry\'s line buffer' do
       pry_eval ':hay_guys'
       Pry::Code.from_file('(pry)').grep(/:hay_guys/).length.should == 1
     end
 
-    should 'default to unknown' do
+    specify 'default to unknown' do
       temp_file('') do |f|
         Pry::Code.from_file(f.path).code_type.should == :unknown
       end
     end
 
-    should 'check the extension' do
+    specify 'check the extension' do
       temp_file('.c') do |f|
         Pry::Code.from_file(f.path).code_type.should == :c
       end
     end
 
-    should 'raise an error if the file doesn\'t exist' do
+    specify 'raise an error if the file doesn\'t exist' do
       expect do
         Pry::Code.from_file('/knalkjsdnalsd/alkjdlkq')
       end.to raise_error MethodSource::SourceNotFoundError
     end
 
-    should 'check for files relative to origin pwd' do
+    specify 'check for files relative to origin pwd' do
       Dir.chdir('spec') do |f|
         Pry::Code.from_file('spec/' + File.basename(__FILE__)).code_type.should == :ruby
       end
     end
 
-    should 'check for Ruby files relative to origin pwd with `.rb` omitted' do
+    specify 'check for Ruby files relative to origin pwd with `.rb` omitted' do
       Dir.chdir('spec') do |f|
         Pry::Code.from_file('spec/' + File.basename(__FILE__, '.*')).code_type.should == :ruby
       end
     end
 
-    should 'find files that are relative to the current working directory' do
+    specify 'find files that are relative to the current working directory' do
       Dir.chdir('spec') do |f|
         Pry::Code.from_file(File.basename(__FILE__)).code_type.should == :ruby
       end
@@ -87,7 +87,7 @@ describe Pry::Code do
   end
 
   describe '.from_method' do
-    should 'read lines from a method\'s definition' do
+    specify 'read lines from a method\'s definition' do
       m = Pry::Method.from_obj(Pry, :load_history)
       Pry::Code.from_method(m).length.should > 0
     end
@@ -104,15 +104,15 @@ describe Pry::Code do
       @array = ['def hay', '  :guys', 'end']
     end
 
-    should 'break a string into lines' do
+    specify 'break a string into lines' do
       Pry::Code.new(@str).length.should == 3
     end
 
-    should 'accept an array' do
+    specify 'accept an array' do
       Pry::Code.new(@array).length.should == 3
     end
 
-    it 'an array or string should produce an equivalent object' do
+    it 'an array or string specify produce an equivalent object' do
       Pry::Code.new(@str).should == Pry::Code.new(@array)
     end
   end
@@ -130,26 +130,26 @@ describe Pry::Code do
 
     describe 'filters' do
       describe '#between' do
-        should 'work with an inclusive range' do
+        specify 'work with an inclusive range' do
           @code = @code.between(1..3)
           @code.length.should == 3
           @code.should =~ /\Aclass MyProgram/
           @code.should =~ /world!'\Z/
         end
 
-        should 'default to an inclusive range' do
+        specify 'default to an inclusive range' do
           @code = @code.between(3, 5)
           @code.length.should == 3
         end
 
-        should 'work with an exclusive range' do
+        specify 'work with an exclusive range' do
           @code = @code.between(2...4)
           @code.length.should == 2
           @code.should =~ /\A  def self/
           @code.should =~ /world!'\Z/
         end
 
-        should 'use real line numbers for positive indices' do
+        specify 'use real line numbers for positive indices' do
           @code = @code.after(3, 3)
           @code = @code.between(4, 4)
           @code.length.should == 1
@@ -158,14 +158,14 @@ describe Pry::Code do
       end
 
       describe '#before' do
-        should 'work' do
+        specify 'work' do
           @code = @code.before(3, 1)
           @code.should =~ /\A  def self\.main\Z/
         end
       end
 
       describe '#around' do
-        should 'work' do
+        specify 'work' do
           @code = @code.around(3, 1)
           @code.length.should == 3
           @code.should =~ /\A  def self/
@@ -174,14 +174,14 @@ describe Pry::Code do
       end
 
       describe '#after' do
-        should 'work' do
+        specify 'work' do
           @code = @code.after(3, 1)
           @code.should =~ /\A  end\Z/
         end
       end
 
       describe '#grep' do
-        should 'work' do
+        specify 'work' do
           @code = @code.grep(/end/)
           @code.length.should == 2
         end
@@ -190,12 +190,12 @@ describe Pry::Code do
 
     describe 'formatters' do
       describe '#with_line_numbers' do
-        should 'show line numbers' do
+        specify 'show line numbers' do
           @code = @code.with_line_numbers
           @code.should =~ /1:/
         end
 
-        should 'disable line numbers when falsy' do
+        specify 'disable line numbers when falsy' do
           @code = @code.with_line_numbers
           @code = @code.with_line_numbers(false)
           @code.should_not =~ /1:/
@@ -203,12 +203,12 @@ describe Pry::Code do
       end
 
       describe '#with_marker' do
-        should 'show a marker in the right place' do
+        specify 'show a marker in the right place' do
           @code = @code.with_marker(2)
           @code.should =~ /^ =>   def self/
         end
 
-        should 'disable the marker when falsy' do
+        specify 'disable the marker when falsy' do
           @code = @code.with_marker(2)
           @code = @code.with_marker(false)
           @code.should =~ /^  def self/
@@ -216,12 +216,12 @@ describe Pry::Code do
       end
 
       describe '#with_indentation' do
-        should 'indent the text' do
+        specify 'indent the text' do
           @code = @code.with_indentation(2)
           @code.should =~ /^    def self/
         end
 
-        should 'disable the indentation when falsy' do
+        specify 'disable the indentation when falsy' do
           @code = @code.with_indentation(2)
           @code = @code.with_indentation(false)
           @code.should =~ /^  def self/
@@ -231,7 +231,7 @@ describe Pry::Code do
 
     describe 'composition' do
       describe 'grep and with_line_numbers' do
-        should 'work' do
+        specify 'work' do
           @code = @code.grep(/end/).with_line_numbers
           @code.should =~ /\A4:   end/
           @code.should =~ /5: end\Z/
@@ -239,7 +239,7 @@ describe Pry::Code do
       end
 
       describe 'grep and before and with_line_numbers' do
-        should 'work' do
+        specify 'work' do
           @code = @code.grep(/e/).before(5, 5).with_line_numbers
           @code.should =~ /\A2:   def self.main\n3:/
           @code.should =~ /4:   end\Z/
@@ -247,7 +247,7 @@ describe Pry::Code do
       end
 
       describe 'before and after' do
-        should 'work' do
+        specify 'work' do
           @code = @code.before(4, 2).after(2)
           @code.should == "    puts 'Hello, world!'"
         end
diff --git a/spec/helpers/table_spec.rb b/spec/helpers/table_spec.rb
index 4a30c962..128e6f5e 100644
--- a/spec/helpers/table_spec.rb
+++ b/spec/helpers/table_spec.rb
@@ -98,7 +98,7 @@ asfadsssaaad    fasfaafdssd     s
     end
   end
 
-  should 'decide between one-line or indented output' do
+  specify 'decide between one-line or indented output' do
     Pry::Helpers.tablify_or_one_line('head', %w(ing)).should == "head: ing\n"
   end
 end