diff --git a/tests/data/test1004 b/tests/data/test1004
index d176a16582..33faaafb19 100644
--- a/tests/data/test1004
+++ b/tests/data/test1004
@@ -53,8 +53,5 @@ User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test1446 b/tests/data/test1446
index f633ac17ad..c606ef427d 100644
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -35,8 +35,5 @@ perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)'
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test1459 b/tests/data/test1459
index 6aab500038..335b265766 100644
--- a/tests/data/test1459
+++ b/tests/data/test1459
@@ -40,8 +40,5 @@ CURL_HOME=%PWD/%LOGDIR/test%TESTNUMBER.dir
 <errorcode>
 60
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test1592 b/tests/data/test1592
index e0adc0efc0..4dde497606 100644
--- a/tests/data/test1592
+++ b/tests/data/test1592
@@ -29,9 +29,6 @@ http://a-site-never-accessed.example.org/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <errorcode>
 0
 </errorcode>
diff --git a/tests/data/test2004 b/tests/data/test2004
index 404b354cec..a9cb75f796 100644
--- a/tests/data/test2004
+++ b/tests/data/test2004
@@ -72,8 +72,5 @@ for several protocols
 Test data file
 for tftp test
 </stdout>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test3021 b/tests/data/test3021
index bdf8f375cf..56b4f9b4f7 100644
--- a/tests/data/test3021
+++ b/tests/data/test3021
@@ -46,8 +46,5 @@ test
 <errorcode>
 0
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test3022 b/tests/data/test3022
index d76e5f4936..1213a02884 100644
--- a/tests/data/test3022
+++ b/tests/data/test3022
@@ -46,8 +46,5 @@ test
 <errorcode>
 0
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test518 b/tests/data/test518
index 05a809bf32..8cbdfed331 100644
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -60,8 +60,5 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test582 b/tests/data/test582
index 194591b53e..de6a1a1ddf 100644
--- a/tests/data/test582
+++ b/tests/data/test582
@@ -34,9 +34,6 @@ Moooooooooooo
 
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <strip>
 </strip>
 <protocol>
diff --git a/tests/data/test583 b/tests/data/test583
index 0f49cd9955..c9e614bae8 100644
--- a/tests/data/test583
+++ b/tests/data/test583
@@ -35,9 +35,6 @@ sftp://localhost:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %USER: %LOGDIR/s
 
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <errorcode>
 0
 </errorcode>
diff --git a/tests/data/test600 b/tests/data/test600
index f2d6510ab3..40aef1c46c 100644
--- a/tests/data/test600
+++ b/tests/data/test600
@@ -35,8 +35,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test601 b/tests/data/test601
index 1f01ffd878..03f95d824e 100644
--- a/tests/data/test601
+++ b/tests/data/test601
@@ -35,8 +35,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test602 b/tests/data/test602
index 8894c096cf..6eb9b062dd 100644
--- a/tests/data/test602
+++ b/tests/data/test602
@@ -36,8 +36,5 @@ for ssh upload test
 Test data
 for ssh upload test
 </upload>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test603 b/tests/data/test603
index e98b73d110..e422cf07a3 100644
--- a/tests/data/test603
+++ b/tests/data/test603
@@ -36,8 +36,5 @@ for ssh upload test
 Test data
 for ssh upload test
 </upload>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test604 b/tests/data/test604
index 9e129ae5a6..9ac9a23389 100644
--- a/tests/data/test604
+++ b/tests/data/test604
@@ -23,9 +23,6 @@ SFTP retrieval of nonexistent file
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <errorcode>
 78
 </errorcode>
diff --git a/tests/data/test605 b/tests/data/test605
index 380b77a750..d035e64eb8 100644
--- a/tests/data/test605
+++ b/tests/data/test605
@@ -26,8 +26,5 @@ SCP retrieval of nonexistent file
 <errorcode>
 78
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test606 b/tests/data/test606
index 85c462f0f0..757192d680 100644
--- a/tests/data/test606
+++ b/tests/data/test606
@@ -26,8 +26,5 @@ SFTP invalid user login
 <errorcode>
 67
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test607 b/tests/data/test607
index 091a73e4c3..c9718a4e52 100644
--- a/tests/data/test607
+++ b/tests/data/test607
@@ -26,8 +26,5 @@ SCP invalid user login
 <errorcode>
 67
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test608 b/tests/data/test608
index 157713e378..e359dd46c7 100644
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -42,8 +42,5 @@ Test file for rename test
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test609 b/tests/data/test609
index 3b9668552d..dbcabd1c6b 100644
--- a/tests/data/test609
+++ b/tests/data/test609
@@ -38,8 +38,5 @@ Test file for mkdir test
 <errorcode>
 21
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test610 b/tests/data/test610
index 0ca51f73c8..3133ad3fac 100644
--- a/tests/data/test610
+++ b/tests/data/test610
@@ -40,8 +40,5 @@ Dummy test file for rmdir test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test611 b/tests/data/test611
index dc75e20d46..34670c1ca6 100644
--- a/tests/data/test611
+++ b/tests/data/test611
@@ -40,8 +40,5 @@ Dummy test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test612 b/tests/data/test612
index 2c43f6a0d7..267026cb14 100644
--- a/tests/data/test612
+++ b/tests/data/test612
@@ -40,8 +40,5 @@ Dummy test file for remove test
 <upload>
 Dummy test file for remove test
 </upload>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test613 b/tests/data/test613
index f8443efa36..c90adb09f1 100644
--- a/tests/data/test613
+++ b/tests/data/test613
@@ -39,8 +39,5 @@ perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test614 b/tests/data/test614
index 012d6ceecb..1f5214b6e0 100644
--- a/tests/data/test614
+++ b/tests/data/test614
@@ -40,8 +40,5 @@ perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PW
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test615 b/tests/data/test615
index 4626d3f1e4..37a2fccdff 100644
--- a/tests/data/test615
+++ b/tests/data/test615
@@ -37,8 +37,5 @@ for ssh upload test
 <errorcode>
 9
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test616 b/tests/data/test616
index 0ebc734349..f76c68afa2 100644
--- a/tests/data/test616
+++ b/tests/data/test616
@@ -32,8 +32,5 @@ SFTP retrieval of empty file
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test617 b/tests/data/test617
index 0ab6ced01f..af0f23b09e 100644
--- a/tests/data/test617
+++ b/tests/data/test617
@@ -32,8 +32,5 @@ SCP retrieval of empty file
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test618 b/tests/data/test618
index 2094768f30..0d2933b277 100644
--- a/tests/data/test618
+++ b/tests/data/test618
@@ -26,9 +26,6 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <stdout>
 Test data
 for ssh test
diff --git a/tests/data/test619 b/tests/data/test619
index 6c3296c92d..12b064d23d 100644
--- a/tests/data/test619
+++ b/tests/data/test619
@@ -26,9 +26,6 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <stdout>
 Test data
 for ssh test
diff --git a/tests/data/test620 b/tests/data/test620
index 0f32d6fdf4..69641001de 100644
--- a/tests/data/test620
+++ b/tests/data/test620
@@ -27,9 +27,6 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <stdout>
 Test data
 for ssh test
diff --git a/tests/data/test621 b/tests/data/test621
index cafd808959..683575cead 100644
--- a/tests/data/test621
+++ b/tests/data/test621
@@ -27,9 +27,6 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <stdout>
 Test data
 for ssh test
diff --git a/tests/data/test622 b/tests/data/test622
index 014ea96d9e..b210c93560 100644
--- a/tests/data/test622
+++ b/tests/data/test622
@@ -36,8 +36,5 @@ for ssh upload test
 <errorcode>
 78
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test623 b/tests/data/test623
index 945079b3f3..55802be2ac 100644
--- a/tests/data/test623
+++ b/tests/data/test623
@@ -33,9 +33,6 @@ for ssh upload test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <errorcode>
 25
 </errorcode>
diff --git a/tests/data/test624 b/tests/data/test624
index 3a4ca4b32c..e126fd192f 100644
--- a/tests/data/test624
+++ b/tests/data/test624
@@ -40,8 +40,5 @@ for ssh upload test
 Test data
 for ssh upload test
 </upload>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test625 b/tests/data/test625
index ff7549477a..d9b9ac824e 100644
--- a/tests/data/test625
+++ b/tests/data/test625
@@ -40,8 +40,5 @@ for ssh upload test
 Test data
 for ssh upload test
 </upload>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test626 b/tests/data/test626
index b963b6dedf..2c74329c04 100644
--- a/tests/data/test626
+++ b/tests/data/test626
@@ -35,8 +35,5 @@ Test file for rename test
 <errorcode>
 21
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test627 b/tests/data/test627
index 8ebdc123c0..6ce173d63f 100644
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -37,9 +37,6 @@ Dummy test file for remove test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <protocol>
 </protocol>
 </verify>
diff --git a/tests/data/test628 b/tests/data/test628
index 755181e319..a1407e4a85 100644
--- a/tests/data/test628
+++ b/tests/data/test628
@@ -26,8 +26,5 @@ SFTP invalid user login (password authentication)
 <errorcode>
 67
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test629 b/tests/data/test629
index 6bf42f4a6c..e413e2c663 100644
--- a/tests/data/test629
+++ b/tests/data/test629
@@ -26,8 +26,5 @@ SCP invalid user login (password authentication)
 <errorcode>
 67
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test630 b/tests/data/test630
index 8a5c443883..3ab532b914 100644
--- a/tests/data/test630
+++ b/tests/data/test630
@@ -27,8 +27,5 @@ SFTP incorrect host key
 <errorcode>
 60
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test631 b/tests/data/test631
index ebf661440a..4f9669b461 100644
--- a/tests/data/test631
+++ b/tests/data/test631
@@ -27,8 +27,5 @@ SCP incorrect host key
 <errorcode>
 60
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test633 b/tests/data/test633
index 8f8c4352dc..6a4da83b5a 100644
--- a/tests/data/test633
+++ b/tests/data/test633
@@ -35,8 +35,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test634 b/tests/data/test634
index 3669a8bf99..94fd9e3d63 100644
--- a/tests/data/test634
+++ b/tests/data/test634
@@ -36,8 +36,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test635 b/tests/data/test635
index b07b5c8237..11a2457ecb 100644
--- a/tests/data/test635
+++ b/tests/data/test635
@@ -35,8 +35,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test636 b/tests/data/test636
index 96ffc0c136..cb0b4524ef 100644
--- a/tests/data/test636
+++ b/tests/data/test636
@@ -36,8 +36,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test637 b/tests/data/test637
index df80c483a0..a77cbf1282 100644
--- a/tests/data/test637
+++ b/tests/data/test637
@@ -37,8 +37,5 @@ for ssh test
 <errorcode>
 36
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test638 b/tests/data/test638
index b41a3aecf8..a57d32168a 100644
--- a/tests/data/test638
+++ b/tests/data/test638
@@ -42,8 +42,5 @@ Dummy test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test639 b/tests/data/test639
index 8105798fd4..a93cc3f95e 100644
--- a/tests/data/test639
+++ b/tests/data/test639
@@ -42,8 +42,5 @@ Dummy test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test640 b/tests/data/test640
index ecfc0934fd..31d2305d3a 100644
--- a/tests/data/test640
+++ b/tests/data/test640
@@ -34,8 +34,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test641 b/tests/data/test641
index 828198b445..0e82dbc0a0 100644
--- a/tests/data/test641
+++ b/tests/data/test641
@@ -34,8 +34,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test642 b/tests/data/test642
index ccb0c605d3..a249d642bb 100644
--- a/tests/data/test642
+++ b/tests/data/test642
@@ -35,8 +35,5 @@ for ssh test
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test656 b/tests/data/test656
index 9478757d5b..22eb6c1b2b 100644
--- a/tests/data/test656
+++ b/tests/data/test656
@@ -23,9 +23,6 @@ SFTP retrieval with nonexistent private key file
 #
 # Verify data after the test has been "shot"
 <verify>
-<valgrind>
-disable
-</valgrind>
 <errorcode>
 67
 </errorcode>
diff --git a/tests/data/test664 b/tests/data/test664
index 6ef1d90cbe..4a36a284aa 100644
--- a/tests/data/test664
+++ b/tests/data/test664
@@ -37,8 +37,5 @@ test
 <errorcode>
 0
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test665 b/tests/data/test665
index bdab82945a..fe020e1ac7 100644
--- a/tests/data/test665
+++ b/tests/data/test665
@@ -37,8 +37,5 @@ test
 <errorcode>
 0
 </errorcode>
-<valgrind>
-disable
-</valgrind>
 </verify>
 </testcase>