diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index e2a90c1c2e..f3fdededf6 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -126,17 +126,14 @@ PTESTS_SLOW = "\
     tcl \
     tcl8 \
     util-linux \
-    valgrind \
 "
 
 # python3 ptests hang on qemuriscv64
-PTESTS_SLOW:remove:riscv64 = "valgrind python3"
-PTESTS_PROBLEMS:append:riscv64 = " valgrind python3"
-PTESTS_SLOW:remove:riscv32 = "lttng-tools strace valgrind"
-PTESTS_PROBLEMS:append:riscv32 = " lttng-tools strace valgrind"
+PTESTS_SLOW:remove:riscv64 = "python3"
+PTESTS_PROBLEMS:append:riscv64 = " python3"
+PTESTS_SLOW:remove:riscv32 = "lttng-tools strace "
+PTESTS_PROBLEMS:append:riscv32 = " lttng-tools strace"
 PTESTS_SLOW:append:libc-musl = " libc-test"
-PTESTS_SLOW:remove:x86 = "valgrind"
-PTESTS_PROBLEMS:append:x86 = " valgrind"
 
 #    ruby \ # Timeout
 #    rt-tests \ # Needs to be checked whether it runs at all