diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature
index 3a041d92b0..103936b6e6 100644
--- a/lms/djangoapps/courseware/features/certificates.feature
+++ b/lms/djangoapps/courseware/features/certificates.feature
@@ -28,6 +28,9 @@ Feature: Verified certificates
         When I submit valid payment information
         Then I see that my payment was successful
 
+
+    # Not yet implemented LMS-982
+    @skip
     Scenario: Verified courses display correctly on dashboard
         Given I have submitted photos to verify my identity
         When I submit valid payment information
@@ -35,6 +38,8 @@ Feature: Verified certificates
         Then I see the course on my dashboard
         And I see that I am on the verified track
 
+    # Not easily automated
+    @skip
     Scenario: I can re-take photos
         Given I have submitted my "<PhotoType>" photo
         When I retake my "<PhotoType>" photo
@@ -45,19 +50,31 @@ Feature: Verified certificates
         | face          |
         | ID            |
 
+    # Not yet implemented LMS-983
+    @skip
     Scenario: I can edit identity information
         Given I have submitted face and ID photos
         When I edit my name
         Then I see the new name on the confirmation page.
 
+    # Currently broken LMS-1009
+    @skip
     Scenario: I can return to the verify flow
-        Given I have submitted photos
+        Given I have submitted photos to verify my identity
         When I leave the flow and return
-        I see the payment page
+        Then I am at the verified page
 
+    # Currently broken LMS-1009
+    @skip
+    Scenario: I can pay from the return flow
+        Given I have submitted photos to verify my identity
+        When I leave the flow and return
+        And I press the payment button
+        Then I am at the payment page
 
     # Design not yet finalized
-    #Scenario: I can take a verified certificate course for free
-    #    Given I have submitted photos to verify my identity
-    #    When I give a reason why I cannot pay
-    #    Then I see that I am registered for a verified certificate course on my dashboard
+    @skip
+    Scenario: I can take a verified certificate course for free
+       Given I have submitted photos to verify my identity
+       When I give a reason why I cannot pay
+       Then I see that I am registered for a verified certificate course on my dashboard
diff --git a/lms/djangoapps/courseware/features/certificates.py b/lms/djangoapps/courseware/features/certificates.py
index c63be69175..b1f31d2f70 100644
--- a/lms/djangoapps/courseware/features/certificates.py
+++ b/lms/djangoapps/courseware/features/certificates.py
@@ -208,14 +208,18 @@ def see_that_i_am_on_the_verified_track(step):
     assert False, 'Implement this step after the design is done'
 
 
-@step(u'I have submitted my "([^"]*)" photo')
-def submitted_my_foo_photo(step, name):
-    assert False, 'This step must be implemented'
-@step(u'I retake my "([^"]*)" photo')
-def retake_my_group1_photo(step, group1):
-    assert False, 'This step must be implemented'
-@step(u'I see the new photo on the confirmation page.')
-def sesee_the_new_photo_on_the_confirmation_page(step):
+@step(u'I leave the flow and return$')
+def leave_the_flow_and_return(step):
+    world.browser.back()
+
+
+@step(u'I am at the verified page$')
+def see_the_payment_page(step):
+    assert world.css_find('button#pay_button')
+
+
+@step(u'I press the payment button')
+def press_payment_button(step):
     assert False, 'This step must be implemented'
 @step(u'I have submitted face and ID photos')
 def submitted_face_and_id_photos(step):
@@ -229,12 +233,6 @@ def sesee_the_new_name_on_the_confirmation_page(step):
 @step(u'I have submitted photos')
 def submitted_photos(step):
     assert False, 'This step must be implemented'
-@step(u'I leave the flow and return')
-def leave_the_flow_and_return(step):
-    assert False, 'This step must be implemented'
-@step(u'I see the payment page')
-def see_the_payment_page(step):
-    assert False, 'This step must be implemented'
 @step(u'I am registered for the course')
 def seam_registered_for_the_course(step):
     assert False, 'This step must be implemented'