diff --git a/test/lit.cfg b/test/lit.cfg
index 9df01375..b99deb39 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -213,8 +213,8 @@ class Configuration(object):
         self.obj_root = None
         self.library_root = None
         self.env = {}
-        self.compile_flags = ['-nostdinc++']
-        self.link_flags = ['-nodefaultlibs']
+        self.compile_flags = []
+        self.link_flags = []
         self.use_system_lib = False
         self.use_clang_verify = False
         self.use_ccache = False
@@ -451,6 +451,7 @@ class Configuration(object):
 
     def configure_compile_flags(self):
         # Configure extra compiler flags.
+        self.compile_flags += ['-nostdinc++']
         self.compile_flags += ['-I' + self.src_root + '/include',
                                '-I' + self.src_root + '/test/support']
         if sys.platform.startswith('linux'):
@@ -485,6 +486,7 @@ class Configuration(object):
 
 
     def configure_link_flags(self):
+        self.link_flags += ['-nodefaultlibs']
         # Configure library search paths
         abi_library_path = self.get_lit_conf('abi_library_path', '')
         if not self.use_system_lib: