Index: test/macosx/universal/TestUniversal.py
===================================================================
--- test/macosx/universal/TestUniversal.py
+++ test/macosx/universal/TestUniversal.py
@@ -1,6 +1,6 @@
 """Test aspects of lldb commands on universal binaries."""
 
-import os, time
+import os, time, sys
 import unittest2
 import lldb
 from lldbtest import *
@@ -17,8 +17,10 @@
         self.line = line_number('main.c', '// Set break point at this line.')
 
     @python_api_test
-    @skipUnlessDarwin
-    @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires i386 or x86_64")
+    @unittest2.skipUnless(
+            sys.platform.startswith('darwin') and
+            os.uname()[4] in ['i386', 'x86_64'],
+            "requires i386 or x86_64")
     def test_sbdebugger_create_target_with_file_and_target_triple(self):
         """Test the SBDebugger.CreateTargetWithFileAndTargetTriple() API."""
         # Invoke the default build rule.
@@ -35,8 +37,10 @@
         process = target.LaunchSimple (None, None, self.get_process_working_directory())
         self.assertTrue(process, PROCESS_IS_VALID)
 
-    @skipUnlessDarwin
-    @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires i386 or x86_64")
+    @unittest2.skipUnless(
+            sys.platform.startswith('darwin') and
+            os.uname()[4] in ['i386', 'x86_64'],
+            "requires i386 or x86_64")
     def test_process_launch_for_universal(self):
         """Test process launch of a universal binary."""
         from lldbutil import print_registers