diff --git a/gdbserver_tests/nlgone_abrt.vgtest b/gdbserver_tests/nlgone_abrt.vgtest
index 86aecfd5c..e1e9f24fd 100644
--- a/gdbserver_tests/nlgone_abrt.vgtest
+++ b/gdbserver_tests/nlgone_abrt.vgtest
@@ -10,3 +10,4 @@ argsB: --quiet -l 60 --nx ./gone
 stdinB: nlgone_abrt.stdinB.gdb
 stdoutB_filter: filter_gdb
 stderrB_filter: filter_gdb
+cleanup: rm -f vgcore.*
diff --git a/memcheck/tests/deep-backtrace.vgtest b/memcheck/tests/deep-backtrace.vgtest
index ebeccf935..a3fd1dfad 100644
--- a/memcheck/tests/deep-backtrace.vgtest
+++ b/memcheck/tests/deep-backtrace.vgtest
@@ -1,2 +1,3 @@
 prog: deep-backtrace
 vgopts: -q --num-callers=500
+cleanup: rm -f vgcore.*
diff --git a/none/tests/linux/blockfault.vgtest b/none/tests/linux/blockfault.vgtest
index 88e325592..8d10f1aa9 100644
--- a/none/tests/linux/blockfault.vgtest
+++ b/none/tests/linux/blockfault.vgtest
@@ -1 +1,2 @@
 prog: blockfault
+cleanup: rm -f vgcore.*
diff --git a/none/tests/linux/stack-overflow.vgtest b/none/tests/linux/stack-overflow.vgtest
index 3b9ffd49b..e7b4f298a 100644
--- a/none/tests/linux/stack-overflow.vgtest
+++ b/none/tests/linux/stack-overflow.vgtest
@@ -1 +1,2 @@
 prog: stack-overflow
+cleanup: rm -f vgcore.*
diff --git a/none/tests/s390x/op00.vgtest b/none/tests/s390x/op00.vgtest
index 948fb85d6..e570976b3 100644
--- a/none/tests/s390x/op00.vgtest
+++ b/none/tests/s390x/op00.vgtest
@@ -1 +1,2 @@
 prog: op00
+cleanup: rm -f vgcore.*
diff --git a/none/tests/x86-linux/hang.vgtest b/none/tests/x86-linux/hang.vgtest
index c3678bbf5..9b17ae010 100644
--- a/none/tests/x86-linux/hang.vgtest
+++ b/none/tests/x86-linux/hang.vgtest
@@ -3,3 +3,4 @@
 # Can only be reproduced on an x86 box running a 32-bit kernel.
 prog: hang
 vgopts: -q
+cleanup: rm -f vgcore.*