diff --git a/frontend/src/app/features/work-packages/components/wp-activity/activity-entry.component.html b/frontend/src/app/features/work-packages/components/wp-activity/activity-entry.component.html
index 2d559cd9cb..daeed81c0d 100644
--- a/frontend/src/app/features/work-packages/components/wp-activity/activity-entry.component.html
+++ b/frontend/src/app/features/work-packages/components/wp-activity/activity-entry.component.html
@@ -1,4 +1,7 @@
-<div id="activity-{{ activityNo }}">
+<div
+  id="activity-{{ activityNo }}"
+  [attr.data-qa-activity-number]="activityNo"
+>
   <div [ngSwitch]="activityType">
     <revision-activity
       *ngSwitchCase="'Revision'"
diff --git a/frontend/src/app/features/work-packages/components/wp-activity/revision/revision-activity.component.html b/frontend/src/app/features/work-packages/components/wp-activity/revision/revision-activity.component.html
index d5813e659b..341cd3f54c 100644
--- a/frontend/src/app/features/work-packages/components/wp-activity/revision/revision-activity.component.html
+++ b/frontend/src/app/features/work-packages/components/wp-activity/revision/revision-activity.component.html
@@ -6,6 +6,7 @@
     <span
       *ngIf="hasUnreadNotification"
       class="op-bubble"
+      data-qa-selector="revision-activity-bubble"
     ></span>
     <activity-link
       [workPackage]="workPackage"
diff --git a/frontend/src/app/features/work-packages/components/wp-activity/user/user-activity.component.html b/frontend/src/app/features/work-packages/components/wp-activity/user/user-activity.component.html
index f6a50f5798..703a209315 100644
--- a/frontend/src/app/features/work-packages/components/wp-activity/user/user-activity.component.html
+++ b/frontend/src/app/features/work-packages/components/wp-activity/user/user-activity.component.html
@@ -24,6 +24,7 @@
     <span
       *ngIf="hasUnreadNotification"
       class="op-bubble"
+      data-qa-selector="user-activity-bubble"
     ></span>
     <activity-link
       [workPackage]="workPackage"
diff --git a/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.html b/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.html
index 2d2daa732e..78284c102e 100644
--- a/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.html
+++ b/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.html
@@ -39,6 +39,7 @@
           <op-tab-count
             *ngIf="tab.counter && tab.showCountAsBubble"
             [counter]="tab.counter"
+            [attr.data-qa-selector]="'tab-counter-' + tab.name"
           ></op-tab-count>
           <span *ngIf="tab.counter && !tab.showCountAsBubble"> ({{ tab.counter | async }})</span>
         </a>
diff --git a/spec/features/work_packages/tabs/activity_notifications_spec.rb b/spec/features/work_packages/tabs/activity_notifications_spec.rb
new file mode 100644
index 0000000000..c3aeae39cf
--- /dev/null
+++ b/spec/features/work_packages/tabs/activity_notifications_spec.rb
@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+require 'features/work_packages/work_packages_page'
+require 'support/edit_fields/edit_field'
+
+describe 'Activity tab notifications', js: true, selenium: true do
+  shared_let(:project) { FactoryBot.create :project_with_types, public: true }
+  shared_let(:work_package) do
+    work_package = FactoryBot.create(:work_package,
+                                     project: project,
+                                     created_at: 5.days.ago.to_date.to_s(:db))
+
+    work_package.update({
+      journal_notes: 'First comment on this wp.', 
+      updated_at: 5.days.ago.to_date.to_s
+    })
+    work_package.update({
+      journal_notes: 'Second comment on this wp.', 
+      updated_at: 4.days.ago.to_date.to_s
+    })
+    work_package.update({
+      journal_notes: 'Third comment on this wp.', 
+      updated_at: 3.days.ago.to_date.to_s
+    })
+
+    work_package
+  end
+  shared_let(:admin) { FactoryBot.create(:admin) }
+  shared_let(:full_view) { Pages::FullWorkPackage.new(work_package, project) }
+
+  before do
+    login_as(admin)
+    full_view.visit!
+  end
+
+  context 'has notifications for the work package' do
+    shared_let(:notification) do
+      FactoryBot.create :notification,
+                        recipient: admin,
+                        project: project,
+                        resource: work_package,
+                        journal: work_package.journals.last
+    end
+
+    it 'Shows a notification bubble with the right number' do
+      expect(page).to have_selector('[data-qa-selector="tab-counter-Activity"]', text: '1')
+    end
+
+    it 'Shows a notification icon next to activities that have an unread notification' do
+      expect(page).to have_selector('[data-qa-selector="user-activity-bubble"]', count: 1)
+      expect(page).to have_selector('[data-qa-activity-number="3"] [data-qa-selector="user-activity-bubble"]')
+    end
+  end
+
+  context 'does not have notifications for the work package' do
+    it 'Shows no notification bubble' do
+      expect(page).not_to have_selector('[data-qa-selector="tab-counter-Activity"]')
+    end
+
+    it 'Does not show any notification icons next to activities' do
+      expect(page).not_to have_selector('[data-qa-selector="user-activity-bubble"]')
+    end
+  end
+end