diff --git a/airgun/views/product.py b/airgun/views/product.py
index 0eb2dc861..5ef30c2e1 100644
--- a/airgun/views/product.py
+++ b/airgun/views/product.py
@@ -159,7 +159,7 @@ def is_displayed(self):
 
     @View.nested
     class discovered_repos(View):
-        discover_action = Text("//button[@type='submit']")
+        discover_action = Text("//button[@type='submit' and contains(., 'Discover')]")
         cancel_discovery = Text("//button[@ng-click='cancelDiscovery()']")
         repos = CreateDiscoveredReposView()
 
diff --git a/airgun/views/repository.py b/airgun/views/repository.py
index 8e805195e..d227e6dbd 100644
--- a/airgun/views/repository.py
+++ b/airgun/views/repository.py
@@ -12,7 +12,6 @@
 from airgun.views.common import (
     BaseLoggedInView,
     SearchableViewMixin,
-    SearchableViewMixinPF4,
 )
 from airgun.widgets import (
     ActionsDropdown,
@@ -26,7 +25,7 @@
 )
 
 
-class RepositoriesView(BaseLoggedInView, SearchableViewMixinPF4):
+class RepositoriesView(BaseLoggedInView, SearchableViewMixin):
     breadcrumb = BreadCrumb()
     new = Text("//button[contains(@href, '/repositories/new')]")
     sync = Text("//button[contains(@ng-click, 'syncSelectedRepositories')]")