diff --git a/testing/do-tests.in b/testing/do-tests.in
index 2cee2d4ac..c83fc1d21 100755
--- a/testing/do-tests.in
+++ b/testing/do-tests.in
@@ -233,6 +233,13 @@ do
 @EOF
     fi
 
+    if [ $SUBDIR = "ipv6" ]
+    then
+	IPTABLES="ip6tables"
+    else
+	IPTABLES="iptables"
+    fi
+
     for name in $SUBTESTS
     do
 	let "testnumber += 1"
@@ -464,7 +471,7 @@ do
 
 	    ssh $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \
 		    > $TESTRESULTDIR/${host}.iproute 2>/dev/null
-	    ssh $HOSTLOGIN iptables -v -n -L \
+	    ssh $HOSTLOGIN $IPTABLES -v -n -L \
 		    > $TESTRESULTDIR/${host}.iptables 2>/dev/null
 	    cat >> $TESTRESULTDIR/index.html <<@EOF
     <h3>$host</h3>
@@ -483,7 +490,7 @@ do
 	    <li><a href="$host.auth.log">auth.log</a></li>
 	    <li><a href="$host.daemon.log">daemon.log</a></li>
 	    <li><a href="$host.iproute">ip route list table $SOURCEIP_ROUTING_TABLE</a></li>
-	    <li><a href="$host.iptables">iptables -L</a></li>
+	    <li><a href="$host.iptables">$IPTABLES -L</a></li>
 	</ul>
       </td>
     </tr>