Index: llvm/trunk/lib/Fuzzer/test/NotinstrumentedTest.cpp
===================================================================
--- llvm/trunk/lib/Fuzzer/test/NotinstrumentedTest.cpp
+++ llvm/trunk/lib/Fuzzer/test/NotinstrumentedTest.cpp
@@ -0,0 +1,11 @@
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+
+// This test should not be instrumented.
+#include <cstdint>
+#include <cstddef>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+  return 0;
+}
+
Index: llvm/trunk/lib/Fuzzer/test/UninstrumentedTest.cpp
===================================================================
--- llvm/trunk/lib/Fuzzer/test/UninstrumentedTest.cpp
+++ llvm/trunk/lib/Fuzzer/test/UninstrumentedTest.cpp
@@ -1,11 +0,0 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-
-// This test should not be instrumented.
-#include <cstdint>
-#include <cstddef>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  return 0;
-}
-
Index: llvm/trunk/lib/Fuzzer/test/fuzzer.test
===================================================================
--- llvm/trunk/lib/Fuzzer/test/fuzzer.test
+++ llvm/trunk/lib/Fuzzer/test/fuzzer.test
@@ -34,7 +34,7 @@
 DISABLED: not LLVMFuzzer-UninstrumentedTest-Uninstrumented 2>&1 | FileCheck %s --check-prefix=UNINSTRUMENTED
 UNINSTRUMENTED: ERROR: __sanitizer_set_death_callback is not defined. Exiting.
 
-RUN: not LLVMFuzzer-UninstrumentedTest-NoCoverage 2>&1 | FileCheck %s --check-prefix=NO_COVERAGE
+RUN: not LLVMFuzzer-NotinstrumentedTest-NoCoverage 2>&1 | FileCheck %s --check-prefix=NO_COVERAGE
 NO_COVERAGE: ERROR: no interesting inputs were found. Is the code instrumented for coverage? Exiting
 
 RUN: not LLVMFuzzer-BufferOverflowOnInput 2>&1 | FileCheck %s --check-prefix=OOB
Index: llvm/trunk/lib/Fuzzer/test/no-coverage/CMakeLists.txt
===================================================================
--- llvm/trunk/lib/Fuzzer/test/no-coverage/CMakeLists.txt
+++ llvm/trunk/lib/Fuzzer/test/no-coverage/CMakeLists.txt
@@ -5,7 +5,7 @@
   "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard")
 
 set(NoCoverageTests
-  UninstrumentedTest
+  NotinstrumentedTest
   )
 
 foreach(Test ${NoCoverageTests})