Index: tests/lit.cfg
===================================================================
--- tests/lit.cfg
+++ tests/lit.cfg
@@ -29,10 +29,9 @@
 
 src_root = os.path.join(config.test_source_root, '..')
 try:
-    build_root = glob.glob('%s/build/lib.*' % src_root)[0]
+    config.environment['PYTHONPATH'] = glob.glob('%s/build/lib.*' % src_root)[0]
 except:
-    build_root = ''
-config.environment['PYTHONPATH'] = '%s:%s' % (build_root, src_root)
+    pass
 # LNT needs a UTF-8 locale when running in Python 3 mode. Rely on the host
 # environment to provide it rather than assume a specific UTF-8 locale is
 # present.
Index: tests/testing/cPerf.py
===================================================================
--- tests/testing/cPerf.py
+++ tests/testing/cPerf.py
@@ -1,12 +1,5 @@
 # RUN: python %s
 import unittest, sys, os, tempfile, time, threading, json
-
-try:
-    import lnt.testing.profile.cPerf as cPerf
-except:
-    # No tests to run if cPerf is not available
-    sys.exit(0)
-
 from lnt.testing.profile.perf import LinuxPerfProfile
     
 class CPerfTest(unittest.TestCase):