diff --git a/test/bin/setup-super-scaffolding-system-test b/test/bin/setup-super-scaffolding-system-test
index 371258206..cae1e4be7 100755
--- a/test/bin/setup-super-scaffolding-system-test
+++ b/test/bin/setup-super-scaffolding-system-test
@@ -142,7 +142,8 @@ bin/super-scaffold crud PartialTest Team \
   super_select_test:super_select \
   multiple_super_select_test:super_select{multiple} \
   number_field_test:number_field \
-  text_area_test:text_area --navbar="ti-layout"
+  text_area_test:text_area \
+  address_test:address_field --navbar="ti-layout"
 
 # The test for this webhook is run inline in .circleci/config.yml.
 bin/super-scaffold incoming-webhooks SomeProvider
diff --git a/test/system/super_scaffolding_partial_test.rb b/test/system/super_scaffolding_partial_test.rb
index f66e4e4f2..032b44ef9 100644
--- a/test/system/super_scaffolding_partial_test.rb
+++ b/test/system/super_scaffolding_partial_test.rb
@@ -160,6 +160,15 @@ def setup
       # Number Field Partial
       fill_in "Number Field Test", with: 47
 
+      assert page.has_content? "State / Province / Region"
+      select "United States", from: "Country"
+      assert page.has_content? "State"
+
+      fill_in "Address", with: "123 Main St."
+      fill_in "City", with: "New York"
+      select "New York", from: "State"
+      fill_in "Zip code", with: "10001"
+
       click_on "Create Partial Test"
       assert_text("Partial Test was successfully created.")
 
@@ -206,6 +215,13 @@ def setup
       # Number Field
       refute_nil partial_test.number_field_test
       assert_equal partial_test.number_field_test, 47
+      # Address Field
+      refute_nil partial_test.address_test
+      assert_equal partial_test.address_test.address_one, "123 Main St."
+      assert_equal partial_test.address_test.city, "New York"
+      assert_equal partial_test.address_test.country_id, 233
+      assert_equal partial_test.address_test.region_id, 1452
+      assert_equal partial_test.address_test.postal_code, "10001"
     end
   end
 end
diff --git a/test/system/tangible_thing_test.rb b/test/system/tangible_thing_test.rb
index 5a88ebc5d..0ba3a9263 100644
--- a/test/system/tangible_thing_test.rb
+++ b/test/system/tangible_thing_test.rb
@@ -56,6 +56,13 @@ class TangibleThingTest < ApplicationSystemTestCase
       assert page.has_content? "State / Province"
       select "Japan", from: "Country"
       assert page.has_content? "Prefecture"
+      select "United States", from: "Country"
+      assert page.has_content? "State"
+
+      fill_in "Address", with: "123 Main St."
+      fill_in "City", with: "New York"
+      select "New York", from: "State"
+      fill_in "Zip code", with: "10001"
 
       select "One", from: "Super Select Value"
       select2_select "Multiple Super Select Values", ["Five", "Six"]
@@ -78,6 +85,10 @@ class TangibleThingTest < ApplicationSystemTestCase
       assert_text "One"
       assert_text "Five and Six"
       assert_text "Long text for this text area field"
+      assert_text "123 Main St."
+      assert_text "New York"
+      assert_text "UNITED STATES"
+      assert_text "10001"
 
       click_on "Edit Tangible Thing"