diff --git a/testresults.xml b/testresults.xml
index 087971d..9c6b801 100644
--- a/testresults.xml
+++ b/testresults.xml
@@ -12,153 +12,153 @@
 	>
 		<testcase
 			name="00-noop.sh"
-			classname="log/vcp6-tests.00-noop.sh"
+			classname="log/vcp6-tests.00-noop"
 		>
 		</testcase>
 
 		<testcase
 			name="01-setup-repo-prod.sh"
-			classname="log/vcp6-tests.01-setup-repo-prod.sh"
+			classname="log/vcp6-tests.01-setup-repo-prod"
 		>
 		</testcase>
 
 		<testcase
 			name="01-setup-repo-stage.sh"
-			classname="log/vcp6-tests.01-setup-repo-stage.sh"
+			classname="log/vcp6-tests.01-setup-repo-stage"
 		>
 		</testcase>
 
 		<testcase
 			name="02-install-vcp-debian.sh"
-			classname="log/vcp6-tests.02-install-vcp-debian.sh"
+			classname="log/vcp6-tests.02-install-vcp-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="02-install-vcp-redhat.sh"
-			classname="log/vcp6-tests.02-install-vcp-redhat.sh"
+			classname="log/vcp6-tests.02-install-vcp-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="03-install-vmods-debian.sh"
-			classname="log/vcp6-tests.03-install-vmods-debian.sh"
+			classname="log/vcp6-tests.03-install-vmods-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="03-install-vmods-redhat.sh"
-			classname="log/vcp6-tests.03-install-vmods-redhat.sh"
+			classname="log/vcp6-tests.03-install-vmods-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="04-install-vcs-debian.sh"
-			classname="log/vcp6-tests.04-install-vcs-debian.sh"
+			classname="log/vcp6-tests.04-install-vcs-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="04-install-vcs-redhat.sh"
-			classname="log/vcp6-tests.04-install-vcs-redhat.sh"
+			classname="log/vcp6-tests.04-install-vcs-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="05-install-varnish-agent-debian.sh"
-			classname="log/vcp6-tests.05-install-varnish-agent-debian.sh"
+			classname="log/vcp6-tests.05-install-varnish-agent-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="05-install-varnish-agent-redhat.sh"
-			classname="log/vcp6-tests.05-install-varnish-agent-redhat.sh"
+			classname="log/vcp6-tests.05-install-varnish-agent-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="07-install-vac-debian.sh"
-			classname="log/vcp6-tests.07-install-vac-debian.sh"
+			classname="log/vcp6-tests.07-install-vac-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="07-install-vac-redhat.sh"
-			classname="log/vcp6-tests.07-install-vac-redhat.sh"
+			classname="log/vcp6-tests.07-install-vac-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="10-systemctl-vcp.sh"
-			classname="log/vcp6-tests.10-systemctl-vcp.sh"
+			classname="log/vcp6-tests.10-systemctl-vcp"
 		>
 		</testcase>
 
 		<testcase
 			name="11-systemctl-vcs.sh"
-			classname="log/vcp6-tests.11-systemctl-vcs.sh"
+			classname="log/vcp6-tests.11-systemctl-vcs"
 		>
 		</testcase>
 
 		<testcase
 			name="12-systemctl-varnish-agent.sh"
-			classname="log/vcp6-tests.12-systemctl-varnish-agent.sh"
+			classname="log/vcp6-tests.12-systemctl-varnish-agent"
 		>
 		</testcase>
 
 		<testcase
 			name="14-systemtcl-vac.sh"
-			classname="log/vcp6-tests.14-systemtcl-vac.sh"
+			classname="log/vcp6-tests.14-systemtcl-vac"
 		>
 		</testcase>
 
 		<testcase
 			name="14-sysv-vac.sh"
-			classname="log/vcp6-tests.14-sysv-vac.sh"
+			classname="log/vcp6-tests.14-sysv-vac"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="15-systemctl-varnish-vagent-vac.sh"
-			classname="log/vcp6-tests.15-systemctl-varnish-vagent-vac.sh"
+			classname="log/vcp6-tests.15-systemctl-varnish-vagent-vac"
 		>
 		</testcase>
 
 		<testcase
 			name="15-sysv-varnish-agent-vac.sh"
-			classname="log/vcp6-tests.15-sysv-varnish-agent-vac.sh"
+			classname="log/vcp6-tests.15-sysv-varnish-agent-vac"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="23-varnishtest-all-versions.sh"
-			classname="log/vcp6-tests.23-varnishtest-all-versions.sh"
+			classname="log/vcp6-tests.23-varnishtest-all-versions"
 		>
 		</testcase>
 
 		<testcase
 			name="24-install-vha-debian.sh"
-			classname="log/vcp6-tests.24-install-vha-debian.sh"
+			classname="log/vcp6-tests.24-install-vha-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="24-install-vha-redhat.sh"
-			classname="log/vcp6-tests.24-install-vha-redhat.sh"
+			classname="log/vcp6-tests.24-install-vha-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="25-varnishtest-vcp-specific.sh"
-			classname="log/vcp6-tests.25-varnishtest-vcp-specific.sh"
+			classname="log/vcp6-tests.25-varnishtest-vcp-specific"
 		>
 			<failure
 				type="failed"
@@ -287,51 +287,51 @@
 
 		<testcase
 			name="26-systemctl-vha.sh"
-			classname="log/vcp6-tests.26-systemctl-vha.sh"
+			classname="log/vcp6-tests.26-systemctl-vha"
 		>
 		</testcase>
 
 		<testcase
 			name="27-install-vdisco-debian.sh"
-			classname="log/vcp6-tests.27-install-vdisco-debian.sh"
+			classname="log/vcp6-tests.27-install-vdisco-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="27-install-vdisco-redhat.sh"
-			classname="log/vcp6-tests.27-install-vdisco-redhat.sh"
+			classname="log/vcp6-tests.27-install-vdisco-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="28-systemctl-vdisco.sh"
-			classname="log/vcp6-tests.28-systemctl-vdisco.sh"
+			classname="log/vcp6-tests.28-systemctl-vdisco"
 		>
 		</testcase>
 
 		<testcase
 			name="29-systemctl-varnishncsa.sh"
-			classname="log/vcp6-tests.29-systemctl-varnishncsa.sh"
+			classname="log/vcp6-tests.29-systemctl-varnishncsa"
 		>
 		</testcase>
 
 		<testcase
 			name="30-install-broadcaster-debian.sh"
-			classname="log/vcp6-tests.30-install-broadcaster-debian.sh"
+			classname="log/vcp6-tests.30-install-broadcaster-debian"
 		>
 			<skipped/>
 		</testcase>
 
 		<testcase
 			name="30-install-broadcaster-redhat.sh"
-			classname="log/vcp6-tests.30-install-broadcaster-redhat.sh"
+			classname="log/vcp6-tests.30-install-broadcaster-redhat"
 		>
 		</testcase>
 
 		<testcase
 			name="31-systemctl-broadcaster.sh"
-			classname="log/vcp6-tests.31-systemctl-broadcaster.sh"
+			classname="log/vcp6-tests.31-systemctl-broadcaster"
 		>
 		</testcase>