diff --git a/test/lang/cpp/class_static/TestStaticVariables.py b/test/lang/cpp/class_static/TestStaticVariables.py
index bf7d962..d1f9f81 100644
--- a/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/test/lang/cpp/class_static/TestStaticVariables.py
@@ -11,6 +11,7 @@
 class StaticVariableTestCase(TestBase):
 
     mydir = os.path.join("lang", "cpp", "class_static")
+    failing_compilers = ['clang', 'gcc']
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dsym_test
@@ -19,8 +20,7 @@
         self.buildDsym()
         self.static_variable_commands()
 
-    @expectedFailureClang # llvm.org/pr15261: lldb on Linux does not display the size of (class or file)static arrays
-    @expectedFailureGcc # llvm.org/pr15261: lldb on Linux does not display the size of (class or file)static arrays
+    @expectedFailureLinux('llvm.org/pr15261', failing_compilers) # lldb on Linux does not display the size of (class or file)static arrays
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test that file and class static variables display correctly."""
diff --git a/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index 57612d5..d11dba1 100644
--- a/test/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/test/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -11,6 +11,7 @@
 class IterateFrameAndDisassembleTestCase(TestBase):
 
     mydir = os.path.join("lang", "cpp", "class_types")
+    failing_compilers = ['clang', 'gcc']
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dsym_test
@@ -21,8 +22,7 @@
 
     @dwarf_test
     @expectedFailureFreeBSD('llvm.org/pr14540')
-    @expectedFailureClang # due to llvm.org/pr14540
-    @expectedFailureGcc # due to llvm.org/pr14540
+    @expectedFailureLinux('llvm.org/pr14540', failing_compilers)
     def test_with_dwarf_and_run_command(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.buildDwarf()
@@ -39,8 +39,7 @@
     @python_api_test
     @dwarf_test
     @expectedFailureFreeBSD('llvm.org/pr14540')
-    @expectedFailureClang # due to llvm.org/pr14540
-    @expectedFailureGcc # due to llvm.org/pr14540
+    @expectedFailureLinux('llvm.org/pr14540', failing_compilers)
     def test_with_dwarf_and_python_api(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.buildDwarf()