diff --git a/compiler-rt/test/profile/instrprof-value-prof-shared.test b/compiler-rt/test/profile/instrprof-value-prof-shared.test
index 4c0e92e8ac57..13f8b7f247c6 100644
--- a/compiler-rt/test/profile/instrprof-value-prof-shared.test
+++ b/compiler-rt/test/profile/instrprof-value-prof-shared.test
@@ -20,11 +20,9 @@
 // Same as above but with profile online merging enabled.
 // RUN: rm -fr %t.prof/
 // RUN: mkdir -p %t.prof/
-// RUN: %clang_pgogen -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -fPIC -shared -o %t.d/t.ir.m.shared -DSHARED_LIB  %S/Inputs/instrprof-value-prof-real.c
-// RUN: %clang_pgogen -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -rpath %t.d -o %t.ir.m %t.d/t.ir.m.shared -DCALL_SHARED  %S/Inputs/instrprof-value-prof-real.c
-// FIXME: When pgogen's behavior changed to enable merging by default, there is no need to use env var.
-// Two profile data files should be dumped to %t.prof/ dir.
-// RUN: env LLVM_PROFILE_FILE=%t.prof/default_%m.profraw LLVM_VP_MAX_NUM_VALS_PER_SITE=255 %run %t.ir.m
+// RUN: %clang_pgogen=%t.prof -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -fPIC -shared -o %t.d/t.ir.m.shared -DSHARED_LIB  %S/Inputs/instrprof-value-prof-real.c
+// RUN: %clang_pgogen=%t.prof -O2 -mllvm -disable-vp=false -mllvm -vp-static-alloc=true -mllvm -vp-counters-per-site=256 -rpath %t.d -o %t.ir.m %t.d/t.ir.m.shared -DCALL_SHARED  %S/Inputs/instrprof-value-prof-real.c
+// RUN: LLVM_VP_MAX_NUM_VALS_PER_SITE=255 %run %t.ir.m
 // RUN: llvm-profdata merge -o %t.ir.m.profdata %t.prof/
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.m.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c
 // RUN: llvm-profdata merge -text  %t.ir.m.profdata -o %t.ir.m.proftxt