diff --git a/test/fixtures/account/join_codes.yml b/test/fixtures/account/join_codes.yml
index a6130ed8d..491388a2f 100644
--- a/test/fixtures/account/join_codes.yml
+++ b/test/fixtures/account/join_codes.yml
@@ -3,11 +3,11 @@
   code: 37S0-5678-9XYZ
   usage_count: 0
   usage_limit: 10
-  account: 37s
+  account: 37s_uuid
 
 initech:
   id: <%= ActiveRecord::FixtureSet.identify("initech_join_code", :uuid) %>
   code: INIT-5678-9XYZ
   usage_count: 10
   usage_limit: 10
-  account: initech
+  account: initech_uuid
diff --git a/test/models/identity_test.rb b/test/models/identity_test.rb
index 27fa2b73a..6d5dbc6ec 100644
--- a/test/models/identity_test.rb
+++ b/test/models/identity_test.rb
@@ -27,10 +27,10 @@ class IdentityTest < ActiveSupport::TestCase
       identity.join(account)
     end
 
-    membership = identity.memberships.last
+    membership = identity.memberships.order(created_at: :desc).first
     assert_equal account.external_account_id.to_s, membership.tenant
 
-    user = account.users.last
+    user = account.users.order(created_at: :desc).first
     assert_equal membership, user.membership
     assert_equal identity.email_address, user.name
   end