Index: lnt/tests/test_suite.py
===================================================================
--- lnt/tests/test_suite.py
+++ lnt/tests/test_suite.py
@@ -271,27 +271,27 @@
 
     def run_test(self, opts):
 
-        if self.opts.cc is not None:
-            self.opts.cc = resolve_command_path(self.opts.cc)
+        if opts.cc is not None:
+            opts.cc = resolve_command_path(opts.cc)
 
-            if not lnt.testing.util.compilers.is_valid(self.opts.cc):
+            if not lnt.testing.util.compilers.is_valid(opts.cc):
                 self._fatal('--cc does not point to a valid executable.')
 
             # If there was no --cxx given, attempt to infer it from the --cc.
-            if self.opts.cxx is None:
-                self.opts.cxx = \
-                    lnt.testing.util.compilers.infer_cxx_compiler(self.opts.cc)
-                if self.opts.cxx is not None:
+            if opts.cxx is None:
+                opts.cxx = \
+                    lnt.testing.util.compilers.infer_cxx_compiler(opts.cc)
+                if opts.cxx is not None:
                     logger.info("Inferred C++ compiler under test as: %r"
                                 % (self.opts.cxx,))
                 else:
                     self._fatal("unable to infer --cxx - set it manually.")
             else:
-                self.opts.cxx = resolve_command_path(self.opts.cxx)
+                opts.cxx = resolve_command_path(opts.cxx)
 
-            if not os.path.exists(self.opts.cxx):
+            if not os.path.exists(opts.cxx):
                 self._fatal("invalid --cxx argument %r, does not exist"
-                            % (self.opts.cxx))
+                            % (opts.cxx))
 
         if opts.test_suite_root is None:
             self._fatal('--test-suite is required')