diff --git a/spec/system/all_casa_admins/all_casa_admin_spec.rb b/spec/system/all_casa_admins/all_casa_admin_spec.rb
index 36903a720a..06cb59392c 100644
--- a/spec/system/all_casa_admins/all_casa_admin_spec.rb
+++ b/spec/system/all_casa_admins/all_casa_admin_spec.rb
@@ -52,8 +52,8 @@
     fill_in "Address", with: "123 Main St"
     click_on "Create CASA Organization"
     expect(page).to have_text "CASA Organization was successfully created."
-    organization = CasaOrg.find_by(name: "Cool Org Name")
-    expect(page).to have_current_path "/all_casa_admins/casa_orgs/#{organization.id}", ignore_query: true
+    expect(page).to have_text "Cool Org Name"
+    expect(page).to have_current_path(%r{/all_casa_admins/casa_orgs/\d+}, ignore_query: true)
     expect(page).to have_content "Administrators"
     expect(page).to have_content "Details"
     expect(page).to have_content "Number of admins: 0"
@@ -131,9 +131,16 @@
 
   it "admin invitations expire" do
     all_casa_admin = AllCasaAdmin.invite!(email: "valid@email.com")
+    raw_token = all_casa_admin.raw_invitation_token
+
+    # Invitation is valid within 1 week
     travel 2.days
-    expect(all_casa_admin.valid_invitation?).to be true
+    visit accept_all_casa_admin_invitation_path(invitation_token: raw_token)
+    expect(page).to have_text "Set my password"
+
+    # Invitation expires after 1 week
     travel 8.days
-    expect(all_casa_admin.valid_invitation?).to be false
+    visit accept_all_casa_admin_invitation_path(invitation_token: raw_token)
+    expect(page).to have_text "The invitation token provided is not valid!"
   end
 end
diff --git a/spec/system/all_casa_admins/sessions/new_spec.rb b/spec/system/all_casa_admins/sessions/new_spec.rb
index 08a62800ce..9a48cb5e1e 100644
--- a/spec/system/all_casa_admins/sessions/new_spec.rb
+++ b/spec/system/all_casa_admins/sessions/new_spec.rb
@@ -57,7 +57,12 @@
     end
 
     it "denies access to flipper" do
-      expect { visit "/flipper" }.to raise_error(ActionController::RoutingError)
+      original = Rails.application.env_config["action_dispatch.show_exceptions"]
+      Rails.application.env_config["action_dispatch.show_exceptions"] = :rescuable
+      visit "/flipper"
+      expect(page).to have_text "No route matches [GET] \"/flipper\""
+    ensure
+      Rails.application.env_config["action_dispatch.show_exceptions"] = original
     end
   end
 end