diff --git a/compiler-rt/test/builtins/Unit/test b/compiler-rt/test/builtins/Unit/test
--- a/compiler-rt/test/builtins/Unit/test
+++ b/compiler-rt/test/builtins/Unit/test
@@ -33,11 +33,6 @@
       EXTRA="-fexceptions gcc_personality_test_helper.cxx -lstdc++ /usr/lib/libgcc_s.1.dylib"
       # the libgcc_s.1.dylib use at the end is a hack until libSystem contains _Unwind_Resume
     fi
-    if test $FILE = trampoline_setup_test.c
-    then
-      # this test requires an extra compiler option
-      EXTRA="-fnested-functions"
-    fi
     if test "$REMOTE" = "1"
     then 
       if gcc $CFLAGS $FILE ../../darwin_fat/Release/libcompiler_rt.a $LIBS $EXTRA -o ./remote/$FILE.exe
diff --git a/compiler-rt/test/builtins/Unit/trampoline_setup_test.c b/compiler-rt/test/builtins/Unit/trampoline_setup_test.c
--- a/compiler-rt/test/builtins/Unit/trampoline_setup_test.c
+++ b/compiler-rt/test/builtins/Unit/trampoline_setup_test.c
@@ -1,4 +1,4 @@
-// RUN: %clang_builtins %s %librt -fnested-functions -o %t && %run %t
+// RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_trampoline_setup
 
 #include <stdio.h>