diff --git a/tests/WgetTests.pm b/tests/WgetTests.pm
index 5dd5214..445f8e3 100644
--- a/tests/WgetTests.pm
+++ b/tests/WgetTests.pm
@@ -114,10 +114,20 @@ sub run
       ($cmdline =~ m{^/.*}msx) ? $cmdline : "$self->{_workdir}/$cmdline";
 
     my $valgrind = $ENV{VALGRIND_TESTS};
-    if (!defined $valgrind || $valgrind eq q{} || $valgrind == 0)
+    if (!defined $valgrind)
     {
+        $valgrind = 0;
+    }
+
+    my $gdb = $ENV{GDB_TESTS};
+    if (!defined $gdb)
+    {
+        $gdb = 0;
+    }
 
-        # Valgrind not requested - leave $cmdline as it is
+    if ($gdb == 1)
+    {
+        $cmdline = 'gdb --args ' . $cmdline;
     }
     elsif ($valgrind == 1)
     {
@@ -125,7 +135,7 @@ sub run
           'valgrind --suppressions=../../valgrind-suppressions --error-exitcode=301 --leak-check=yes --track-origins=yes '
           . $cmdline;
     }
-    else
+    elsif ($valgrind ne q{} && $valgrind != 0)
     {
         $cmdline = "$valgrind $cmdline";
     }