diff --git a/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp b/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp
index 83c09e0428ec..19781ba4cd78 100644
--- a/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/SingleMemcmpTest.cpp
@@ -8,7 +8,7 @@
 #include <cstring>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  char *S = (char*)Data;
+  const char *S = (const char*)Data;
   if (Size >= 6 && !memcmp(S, "qwerty", 6)) {
     fprintf(stderr, "BINGO\n");
     exit(1);
diff --git a/llvm/lib/Fuzzer/test/StrcmpTest.cpp b/llvm/lib/Fuzzer/test/StrcmpTest.cpp
index e7636e8812fc..81f041d913e7 100644
--- a/llvm/lib/Fuzzer/test/StrcmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/StrcmpTest.cpp
@@ -13,7 +13,7 @@ bool Eq(const uint8_t *Data, size_t Size, const char *Str) {
   size_t Len = strlen(Str);
   if (Size < Len) return false;
   if (Len >= sizeof(Buff)) return false;
-  memcpy(Buff, (char*)Data, Len);
+  memcpy(Buff, (const char*)Data, Len);
   Buff[Len] = 0;
   int res = strcmp(Buff, Str);
   return res == 0;
diff --git a/llvm/lib/Fuzzer/test/StrncmpTest.cpp b/llvm/lib/Fuzzer/test/StrncmpTest.cpp
index f71f01ee3098..a40e05690a0d 100644
--- a/llvm/lib/Fuzzer/test/StrncmpTest.cpp
+++ b/llvm/lib/Fuzzer/test/StrncmpTest.cpp
@@ -11,7 +11,7 @@ static volatile int sink;
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   // TODO: check other sizes.
-  char *S = (char*)Data;
+  const char *S = (const char*)Data;
   if (Size >= 8 && strncmp(S, "123", 8))
     sink = 1;
   if (Size >= 8 && strncmp(S, "01234567", 8) == 0) {
diff --git a/llvm/lib/Fuzzer/test/value-profile-cmp2.test b/llvm/lib/Fuzzer/test/value-profile-cmp2.test
index 43d62400d97b..d6a40447d79b 100644
--- a/llvm/lib/Fuzzer/test/value-profile-cmp2.test
+++ b/llvm/lib/Fuzzer/test/value-profile-cmp2.test
@@ -1,2 +1,2 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-SimpleHashTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SimpleHashTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 -max_len=64 2>&1 | FileCheck %s