diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index 2e287e7c71..fcb06bb11f 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -162,7 +162,6 @@ feature "As a consumer I want to check out my cart", js: true do
         it "re-renders with errors when we submit the incomplete form" do
           click_button "Purchase"
           current_path.should == "/shop/checkout"
-          save_and_open_page
           page.should have_content "can't be blank"
         end
       end
diff --git a/spec/models/spree/addresses_spec.rb b/spec/models/spree/addresses_spec.rb
index 30497c8c26..6c6a88ba11 100644
--- a/spec/models/spree/addresses_spec.rb
+++ b/spec/models/spree/addresses_spec.rb
@@ -29,6 +29,12 @@ describe Spree::Address do
     end
   end
 
+  describe "setters" do
+    it "lets us set a country" do
+      expect { Spree::Address.new.country = "A country" }.to raise_error ActiveRecord::AssociationTypeMismatch
+    end
+  end
+
   describe "notifying bugsnag when saved with missing data" do
     it "notifies on create" do
       Bugsnag.should_receive(:notify)