diff --git a/features/accepts_invitation.feature b/features/accepts_invitation.feature
index e4cea64c0..e4dc2ea17 100644
--- a/features/accepts_invitation.feature
+++ b/features/accepts_invitation.feature
@@ -11,18 +11,11 @@ Feature: invitation acceptance
       And I press "Create my account"
       Then I should be on the getting started page
       And I should see "Welcome"
-      Then I follow Edit Profile in the same window
       And I fill in the following:
         | profile_first_name | O             |
-        | profile_last_name  | Hai           |
-        | tags               | #beingawesome |
-        | profile_bio        | swagger       |
-        | profile_location   | new york, ny  |
-        | profile_gender     | diasporian    |
-      And I press "Update Profile"
-			And I should see "Welcome"
-		  When I follow "Finished"
-		  Then I should be on the multi page
+
+      When I follow "awesome_button"
+      Then I should be on the multi page
 
     Scenario: accept invitation from user
       Given I have been invited by a user
@@ -35,18 +28,11 @@ Feature: invitation acceptance
       And I press "Create my account"
       Then I should be on the getting started page
       And I should see "Welcome"
-      Then I follow Edit Profile in the same window
       And I fill in the following:
         | profile_first_name | O             |
-        | profile_last_name  | Hai           |
-        | tags               | #beingawesome |
-        | profile_bio        | swagger       |
-        | profile_location   | new york, ny  |
-        | profile_gender     | diasporian    |
-      And I press "Update Profile"
-			And I should see "Welcome"
-		  When I follow "Finished"
-		  Then I should be on the multi page
+
+      When I follow "awesome_button"
+      Then I should be on the multi page
 
     Scenario: sends an invitation
       Given a user with email "bob@bob.bob"
diff --git a/features/signs_up.feature b/features/signs_up.feature
index a6fd97077..7ae8ffc73 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -10,26 +10,17 @@ Feature: new user registration
     And I press "Create my account"
     Then I should be on the getting started page
     And I should see "Welcome"
-    And I should see "Fill out your profile"
-    And I should see "Connect to your other social networks"
-    And I should see "Connect with cool people"
-    And I should see "Follow your interests"
-    And I should see "Connect to Cubbi.es"
+    And I should see "Who are you?"
+    And I should see "What are you into?"
 
   Scenario: new user goes through the setup wizard
-   When I follow Edit Profile in the same window
-    And I fill in "profile_first_name" with "O"
-    And I fill in "profile_last_name" with "Hai"
-    And I fill in "tags" with "#tags"
-    And I press "Update Profile"
-    And I wait for the ajax to finish
-    Then I should see "O Hai" within "#user_menu"
-    And I should see "Welcome"
-    And I follow "Finished"
+    And I fill in the following:
+      | profile_first_name | O             |
+    And I follow "awesome_button"
 
-    Then I should be on the multi page
-    And I should not see "Finished"
+    Then I should be on the aspects page
+    And I should not see "awesome_button"
 
   Scenario: new user skips the setup wizard
-    When I follow "Finished"
+    When I follow "awesome_button"
     Then I should be on the multi page