diff --git a/app/views/groups/bots/personal_access_tokens/_table.html.erb b/app/views/groups/bots/personal_access_tokens/_table.html.erb
index b4c44502b9..c5ab14fad9 100644
--- a/app/views/groups/bots/personal_access_tokens/_table.html.erb
+++ b/app/views/groups/bots/personal_access_tokens/_table.html.erb
@@ -6,11 +6,11 @@
     empty: {
       title:
         t(
-          "projects.bots.index.personal_access_tokens_listing_modal.personal_access_token.empty.title",
+          "groups.bots.index.personal_access_tokens_listing_modal.personal_access_token.empty.title",
         ),
       description:
         t(
-          "projects.bots.index.personal_access_tokens_listing_modal.personal_access_token.empty.description",
+          "groups.bots.index.personal_access_tokens_listing_modal.personal_access_token.empty.description",
           bot_name: @bot_account.user.email,
         ),
     },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f82c5c765..014bd3d93e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -654,6 +654,10 @@ en:
             token_name: Token Name
         personal_access_tokens_listing_modal:
           description: Viewing a list of active personal access tokens for %{bot_account}
+          personal_access_token:
+            empty:
+              description: Bot %{bot_name} has no active personal access tokens.
+              title: No personal access tokens
           title: Personal access tokens
         subtitle: Setup bot accounts to be able to perform actions through the API that cannot be attributed to an individual user.
         title: Bot Accounts
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1a273f2e73..f29af43bb5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -654,6 +654,10 @@ fr:
             token_name: Token Name
         personal_access_tokens_listing_modal:
           description: Viewing a list of active personal access tokens for %{bot_account}
+          personal_access_token:
+            empty:
+              description: Bot %{bot_name} has no active personal access tokens.
+              title: No personal access tokens
           title: Personal access tokens
         subtitle: Setup bot accounts to be able to perform actions through the API that cannot be attributed to an individual user.
         title: Bot Accounts
diff --git a/test/system/groups/bots_test.rb b/test/system/groups/bots_test.rb
index d3f6bbb551..d6ff412811 100644
--- a/test/system/groups/bots_test.rb
+++ b/test/system/groups/bots_test.rb
@@ -45,8 +45,8 @@ def setup
       assert_no_selector 'a', text: I18n.t(:'components.pagination.previous')
 
       within('div.empty_state_message') do
-        assert_text I18n.t(:'groups.bots.index.bot_listing.empty_state.title')
-        assert_text I18n.t(:'groups.bots.index.bot_listing.empty_state.description')
+        assert_text I18n.t(:'bots.index.table.empty_state.title')
+        assert_text I18n.t(:'bots.index.table.empty_state.description')
       end
     end
 
@@ -62,8 +62,8 @@ def setup
       assert_selector 'tr', count: 0
 
       within('div.empty_state_message') do
-        assert_text I18n.t(:'groups.bots.index.bot_listing.empty_state.title')
-        assert_text I18n.t(:'groups.bots.index.bot_listing.empty_state.description')
+        assert_text I18n.t(:'bots.index.table.empty_state.title')
+        assert_text I18n.t(:'bots.index.table.empty_state.description')
       end
 
       click_link I18n.t(:'groups.bots.index.add_new_bot')
@@ -105,8 +105,8 @@ def setup
       assert_selector 'tr', count: 0
 
       within('div.empty_state_message') do
-        assert_text I18n.t(:'groups.bots.index.bot_listing.empty_state.title')
-        assert_text I18n.t(:'groups.bots.index.bot_listing.empty_state.description')
+        assert_text I18n.t(:'bots.index.table.empty_state.title')
+        assert_text I18n.t(:'bots.index.table.empty_state.description')
       end
 
       click_link I18n.t(:'groups.bots.index.add_new_bot')
@@ -136,7 +136,7 @@ def setup
 
       within('table') do
         within('table tbody tr:first-child td:last-child') do
-          click_link I18n.t(:'groups.bots.index.bot.remove')
+          click_link I18n.t(:'bots.index.table.actions.remove')
         end
       end
 
diff --git a/test/system/profile_test.rb b/test/system/profile_test.rb
index 605ee79865..55d6ff627a 100644
--- a/test/system/profile_test.rb
+++ b/test/system/profile_test.rb
@@ -108,7 +108,7 @@ def setup
       assert_text token_to_revoke.name
     end
     within %(tr[id=#{token_to_revoke.id}]) do
-      click_link I18n.t(:'profiles.personal_access_tokens.table.revoke_button')
+      click_link I18n.t(:'personal_access_tokens.table.revoke')
     end
 
     within('#turbo-confirm[open]') do
diff --git a/test/system/projects/bots_test.rb b/test/system/projects/bots_test.rb
index 58dabd1e80..a55fdfaed9 100644
--- a/test/system/projects/bots_test.rb
+++ b/test/system/projects/bots_test.rb
@@ -47,8 +47,8 @@ def setup
       assert_no_selector 'a', text: I18n.t(:'components.pagination.previous')
 
       within('div.empty_state_message') do
-        assert_text I18n.t(:'projects.bots.index.bot_listing.empty_state.title')
-        assert_text I18n.t(:'projects.bots.index.bot_listing.empty_state.description')
+        assert_text I18n.t(:'bots.index.table.empty_state.title')
+        assert_text I18n.t(:'bots.index.table.empty_state.description')
       end
     end
 
@@ -64,8 +64,8 @@ def setup
       assert_selector 'tr', count: 0
 
       within('div.empty_state_message') do
-        assert_text I18n.t(:'projects.bots.index.bot_listing.empty_state.title')
-        assert_text I18n.t(:'projects.bots.index.bot_listing.empty_state.description')
+        assert_text I18n.t(:'bots.index.table.empty_state.title')
+        assert_text I18n.t(:'bots.index.table.empty_state.description')
       end
 
       click_link I18n.t(:'projects.bots.index.add_new_bot')
@@ -107,8 +107,8 @@ def setup
       assert_selector 'tr', count: 0
 
       within('div.empty_state_message') do
-        assert_text I18n.t(:'projects.bots.index.bot_listing.empty_state.title')
-        assert_text I18n.t(:'projects.bots.index.bot_listing.empty_state.description')
+        assert_text I18n.t(:'bots.index.table.empty_state.title')
+        assert_text I18n.t(:'bots.index.table.empty_state.description')
       end
 
       click_link I18n.t(:'projects.bots.index.add_new_bot')
@@ -138,7 +138,7 @@ def setup
 
       within('table') do
         within('table tbody tr:first-child td:last-child') do
-          click_link I18n.t(:'projects.bots.index.bot.remove')
+          click_link I18n.t(:'bots.index.table.actions.remove')
         end
       end