diff --git a/spec/cli/destroy_cli_spec.rb b/spec/cli/destroy_cli_spec.rb
index df295d8..c228ad2 100644
--- a/spec/cli/destroy_cli_spec.rb
+++ b/spec/cli/destroy_cli_spec.rb
@@ -99,7 +99,7 @@
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
-      $stdin.should_receive(:gets).and_return('n')
+      expect($stdin).to receive(:gets).and_return('n')
 
       expect { cli.destroy('example.com') }.to raise_error(SystemExit)
 
diff --git a/spec/cli/info_cli_spec.rb b/spec/cli/info_cli_spec.rb
index 2fdbd1e..980fcc3 100644
--- a/spec/cli/info_cli_spec.rb
+++ b/spec/cli/info_cli_spec.rb
@@ -152,7 +152,7 @@
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('show_droplet'), headers: {})
 
-      $stdin.should_receive(:gets).and_return('0')
+      expect($stdin).to receive(:gets).and_return('0')
 
       cli.info('examp')
 
diff --git a/spec/cli/info_image_cli_spec.rb b/spec/cli/info_image_cli_spec.rb
index b1313a0..a598b02 100644
--- a/spec/cli/info_image_cli_spec.rb
+++ b/spec/cli/info_image_cli_spec.rb
@@ -125,7 +125,7 @@
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('ubuntu_image_9801951'), headers: {})
 
-      $stdin.should_receive(:gets).and_return('0')
+      expect($stdin).to receive(:gets).and_return('0')
 
       cli.info_image('ubun')
 
diff --git a/spec/middleware/inject_client_spec.rb b/spec/middleware/inject_client_spec.rb
index 55635f1..bdbe24a 100644
--- a/spec/middleware/inject_client_spec.rb
+++ b/spec/middleware/inject_client_spec.rb
@@ -14,11 +14,11 @@
     it 'loads the client into the environment' do
       described_class.new(app).call(env)
 
-      env['barge'].should be_a Barge::Client
+      expect(env['barge']).to be_a Barge::Client
     end
 
     it 'creates a client with values from config file' do
-      Barge::Client.should_receive(:new).with(hash_including(access_token: 'foo'))
+      expect(Barge::Client).to receive(:new).with(hash_including(access_token: 'foo'))
 
       described_class.new(app).call(env)
     end