diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl
index 3847d7b5de081a98b2f51e63d273af4bb8ddaf06..72a3e32b7f86e9389755b6ddf4643a705d2d1fa4 100755
--- a/tests/test-wrap-argv.pl
+++ b/tests/test-wrap-argv.pl
@@ -104,27 +104,8 @@ sub rewrap_line {
     print join(" \\\n", @env, $cmd), " \\\n";
     # We might have to split line argument values...
     for (my $i = 0; $i <= $#args; $i++) {
-        my $arg = $args[$i];
-        while (length($arg) > 80) {
-            my $split = rindex $arg, ",", 80;
-            if ($split == -1) {
-                $split = rindex $arg, ":", 80;
-            }
-            if ($split == -1) {
-                $split = rindex $arg, " ", 80;
-            }
-            if ($split == -1) {
-                warn "cannot find nice place to split '$arg' below 80 chars\n";
-                $split = 79;
-            }
-            $split++;
-
-            my $head = substr $arg, 0, $split;
-            $arg = substr $arg, $split;
+        &rewrap_arg($args[$i]);
 
-            print $head, "\\\n";
-        }
-        print $arg;
         if ($i != $#args) {
             print " \\\n";
         } else {
@@ -132,3 +113,28 @@ sub rewrap_line {
         }
     }
 }
+
+sub rewrap_arg {
+    my $arg = shift;
+
+    while (length($arg) > 80) {
+        my $split = rindex $arg, ",", 80;
+        if ($split == -1) {
+            $split = rindex $arg, ":", 80;
+        }
+        if ($split == -1) {
+            $split = rindex $arg, " ", 80;
+        }
+        if ($split == -1) {
+            warn "cannot find nice place to split '$arg' below 80 chars\n";
+            $split = 79;
+        }
+        $split++;
+
+        my $head = substr $arg, 0, $split;
+        $arg = substr $arg, $split;
+
+        print $head, "\\\n";
+    }
+    print $arg;
+}