diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index ffa6f9433b..516c7f1d12 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -21,14 +21,14 @@ describe Spree::OrderMailer do
     end
 
     it "confirm_email_for_customer accepts an order id as an alternative to an Order object" do
-      Spree::Order.should_receive(:find).with(order.id).and_return(order)
+      expect(Spree::Order).to receive(:find).with(order.id).and_return(order)
       expect {
         confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order.id)
       }.to_not raise_error
     end
 
     it "cancel_email accepts an order id as an alternative to an Order object" do
-      Spree::Order.should_receive(:find).with(order.id).and_return(order)
+      expect(Spree::Order).to receive(:find).with(order.id).and_return(order)
       expect {
         cancel_email = Spree::OrderMailer.cancel_email(order.id)
       }.to_not raise_error
diff --git a/spec/mailers/shipment_mailer_spec.rb b/spec/mailers/shipment_mailer_spec.rb
index 8a3fadb0f6..e952536130 100644
--- a/spec/mailers/shipment_mailer_spec.rb
+++ b/spec/mailers/shipment_mailer_spec.rb
@@ -9,8 +9,8 @@ describe Spree::ShipmentMailer do
     variant = build(:variant, product: product)
     line_item = build(:line_item, variant: variant, order: order, quantity: 1, price: 5)
     shipment = build(:shipment)
-    shipment.stub(line_items: [line_item], order: order)
-    shipment.stub(tracking_url: "TRACK_ME")
+    allow(shipment).to receive_messages(line_items: [line_item], order: order)
+    allow(shipment).to receive_messages(tracking_url: "TRACK_ME")
     shipment
   end
 
@@ -28,7 +28,7 @@ describe Spree::ShipmentMailer do
   end
 
   it "shipment_email accepts an shipment id as an alternative to an Shipment object" do
-    Spree::Shipment.should_receive(:find).with(shipment.id).and_return(shipment)
+    expect(Spree::Shipment).to receive(:find).with(shipment.id).and_return(shipment)
     expect {
       shipped_email = Spree::ShipmentMailer.shipped_email(shipment.id)
     }.to_not raise_error
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
index a7c58937c4..71087a9f36 100644
--- a/spec/mailers/test_mailer_spec.rb
+++ b/spec/mailers/test_mailer_spec.rb
@@ -13,7 +13,7 @@ describe Spree::TestMailer do
   end
 
   it "confirm_email accepts a user id as an alternative to a User object" do
-    Spree.user_class.should_receive(:find).with(user.id).and_return(user)
+    expect(Spree.user_class).to receive(:find).with(user.id).and_return(user)
     expect {
       test_email = Spree::TestMailer.test_email(user.id)
     }.to_not raise_error