diff --git a/test/compat_layer.py b/test/compat_layer.py
index 6ebc249..83d32c9 100644
--- a/test/compat_layer.py
+++ b/test/compat_layer.py
@@ -63,11 +63,13 @@ def __init__(self):
 
 @rfm.simple_test
 class ToolsAvailableTest(RunInGentooPrefixTest):
-    tool = parameter(['archspec', 'emerge', 'equery', 'ld.gold', 'make', 'patch', 'patchelf'])
+    tool = parameter(['archspec', 'emerge', 'equery', 'ld.bfd', 'ld.gold', 'make', 'patch', 'patchelf'])
 
     def __init__(self):
         # patchelf is only installed since 2021.06 compat layer
         self.skip_if(self.tool == 'patchelf' and self.eessi_version == '2021.03')
+        # 2023.06 still had both ld.bfd and ld.gold, but the latter will not be included in future versions
+        self.skip_if(self.tool == 'ld.gold' and self.eessi_version != '2023.06')
         super().__init__()
         self.descr = 'Verify that some required tools are available'
         self.command = f'which {self.tool}'
@@ -231,3 +233,15 @@ def __init__(self):
             f'user-defined-trusted-dirs={trusted_dir}',
             self.stdout
         )
+
+
+@rfm.simple_test
+class PipCheckTest(RunInGentooPrefixTest):
+    def __init__(self):
+        super().__init__()
+        self.descr = 'Verify that "pip check" does not return any errors.'
+        self.command = 'pip check'
+        self.sanity_patterns = sn.all([
+            sn.assert_eq(self.exit_code, 0),
+            sn.assert_found('\nNo broken requirements found.\n', self.stdout),
+        ])