diff --git a/src/test/obj_sync/TEST2 b/src/test/obj_sync/DISABLE_TEST2
similarity index 57%
rename from src/test/obj_sync/TEST2
rename to src/test/obj_sync/DISABLE_TEST2
index 130e6991ab6..72aa1510d40 100755
--- a/src/test/obj_sync/TEST2
+++ b/src/test/obj_sync/DISABLE_TEST2
@@ -6,18 +6,18 @@
 # src/test/obj_sync/TEST2 -- unit test for PMEM-resident locks
 #
 
+# XXX disable the test for 'helgrind'
+# until https://github.com/pmem/pmdk/issues/5646 is fixed
+# by adding the prefix DISABLE_ to the script name.
+
 . ../unittest/unittest.sh
 
 require_test_type medium
 
 require_fs_type none
 require_build_type debug nondebug
-# XXX disable the test for 'drd' and  'helgrind'
-# until https://github.com/pmem/pmdk/issues/5646 is fixed.
-#require_valgrind 3.10
-#configure_valgrind helgrind force-enable
-configure_valgrind drd force-disable
-configure_valgrind helgrind force-disable
+require_valgrind 3.10
+configure_valgrind helgrind force-enable
 
 setup
 
diff --git a/src/test/obj_sync/TEST5 b/src/test/obj_sync/DISABLE_TEST5
similarity index 58%
rename from src/test/obj_sync/TEST5
rename to src/test/obj_sync/DISABLE_TEST5
index 53a7bbe2fe7..88fe36477e5 100755
--- a/src/test/obj_sync/TEST5
+++ b/src/test/obj_sync/DISABLE_TEST5
@@ -6,18 +6,18 @@
 # src/test/obj_sync/TEST5 -- unit test for PMEM-resident locks
 #
 
+# XXX disable the test for 'drd'
+# until https://github.com/pmem/pmdk/issues/5646 is fixed
+# by adding the prefix DISABLE_ to the script name.
+
 . ../unittest/unittest.sh
 
 require_test_type medium
 
 require_fs_type none
 require_build_type debug nondebug
-# XXX disable the test for 'drd' and 'helgrind'
-# until https://github.com/pmem/pmdk/issues/5646 is fixed.
-#require_valgrind 3.10
-#configure_valgrind drd force-enable
-configure_valgrind drd force-disable
-configure_valgrind helgrind force-disable
+require_valgrind 3.10
+configure_valgrind drd force-enable
 setup
 
 expect_normal_exit ./obj_sync$EXESUFFIX c 10 5
diff --git a/src/test/obj_sync/TEST6 b/src/test/obj_sync/DISABLE_TEST6
similarity index 57%
rename from src/test/obj_sync/TEST6
rename to src/test/obj_sync/DISABLE_TEST6
index bf720bb57c6..22d3c80d247 100755
--- a/src/test/obj_sync/TEST6
+++ b/src/test/obj_sync/DISABLE_TEST6
@@ -6,18 +6,18 @@
 # src/test/obj_sync/TEST6 -- unit test for PMEM-resident locks
 #
 
+# XXX disable the test for 'helgrind'
+# until https://github.com/pmem/pmdk/issues/5646 is fixed
+# by adding the prefix DISABLE_ to the script name.
+
 . ../unittest/unittest.sh
 
 require_test_type medium
 
 require_fs_type none
 require_build_type debug nondebug
-# XXX disable the test for 'drd' and 'helgrind'
-# until https://github.com/pmem/pmdk/issues/5646 is fixed.
-#require_valgrind 3.10
-#configure_valgrind helgrind force-enable
-configure_valgrind drd force-disable
-configure_valgrind helgrind force-disable
+require_valgrind 3.10
+configure_valgrind helgrind force-enable
 setup
 
 expect_normal_exit ./obj_sync$EXESUFFIX c 10 5