diff --git a/app/views/shop/checkout/_form.html.haml b/app/views/shop/checkout/_form.html.haml
index 0445e28eed..8ac9f67c90 100644
--- a/app/views/shop/checkout/_form.html.haml
+++ b/app/views/shop/checkout/_form.html.haml
@@ -24,12 +24,12 @@
             .large-6.columns
               = ba.text_field :lastname, "ng-model" => "order.bill_address.lastname"
 
-        %fieldset
+        %fieldset#billing
           %legend Billing Address
           = f.fields_for :bill_address, @order.bill_address do |ba|
             .row
               .large-12.columns
-                = ba.text_field :address1, label: "Billing Address",
+                = ba.text_field :address1,
                   "ng-model" => "order.bill_address.address1"
             .row
               .large-12.columns
diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index 00f8455853..d7507189b9 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -72,7 +72,9 @@ feature "As a consumer I want to check out my cart", js: true do
         it "copies billing address to hidden shipping address fields" do
           choose(sm1.name)
           check "Shipping address same as billing address?"
-          fill_in "Billing Address", with: "testy"
+          within "#billing" do
+            fill_in "Address", with: "testy"
+          end
           within "#ship_address_hidden" do
             find("#order_ship_address_attributes_address1", visible: false).value.should == "testy"
           end