diff --git a/lldb/test/API/arm/emulation/TestEmulations.py b/lldb/test/API/arm/emulation/TestEmulations.py
--- a/lldb/test/API/arm/emulation/TestEmulations.py
+++ b/lldb/test/API/arm/emulation/TestEmulations.py
@@ -20,7 +20,7 @@
         files = os.listdir(test_dir)
         thumb_files = list()
         for f in files:
-            if '-thumb.dat' in f:
+            if f.endswith('-thumb.dat'):
                 thumb_files.append(f)
 
         for f in thumb_files:
@@ -33,7 +33,7 @@
         files = os.listdir(test_dir)
         arm_files = list()
         for f in files:
-            if '-arm.dat' in f:
+            if f.endswith('-arm.dat'):
                 arm_files.append(f)
 
         for f in arm_files:
@@ -49,4 +49,5 @@
             print('\nRunning test ' + os.path.basename(filename))
             print(output)
 
-        self.assertTrue(success, 'Emulation test failed.')
+        self.assertTrue(success, 'Emulation test {} failed.'.format(
+                        filename))