diff --git a/test/bin/setup-super-scaffolding-system-test b/test/bin/setup-super-scaffolding-system-test
index 296660c9a..c03286061 100755
--- a/test/bin/setup-super-scaffolding-system-test
+++ b/test/bin/setup-super-scaffolding-system-test
@@ -103,7 +103,6 @@ fi
 if [ -z "${CIRCLE_NODE_INDEX}" ] || [ "${CIRCLE_NODE_INDEX}" == "6" ]; then
   bundle exec spring rails g model TestFile team:references name:string foo:attachment
   bin/super-scaffold crud TestFile Team name:text_field foo:file_field --sidebar="ti.ti-tag"
-  # TODO Write an actual test for this in `test/system/super_scaffolding_test.rb`.
 
   bundle exec spring rails g model ColorPicker team:references color_picker_value:string
   bin/super-scaffold crud ColorPicker Team color_picker_value:color_picker --sidebar="ti.ti-tag"
@@ -112,7 +111,6 @@ else
 fi
 
 # TODO: Generate these in parallel.
-# TODO: Super Scaffold password_field partials correctly.
 bundle exec spring rails g model PartialTest team:references \
   text_field_test:string \
   boolean_test:boolean \
diff --git a/test/system/super_scaffolding_partial_test.rb b/test/system/super_scaffolding_partial_test.rb
index 853b464c5..0607468ea 100644
--- a/test/system/super_scaffolding_partial_test.rb
+++ b/test/system/super_scaffolding_partial_test.rb
@@ -121,7 +121,8 @@ def setup
       # File partial
       attach_file("test/support/foo.txt", make_visible: true)
       # Single Option partial
-      choose("One")
+      # TODO: Not sure why we have to specify this, but not the other button with "one".
+      page.all("input").find { |node| node.value == "one" }.click
       # Multiple Option partial
       check("One")
       check("Three")