diff --git a/testresults.xml b/testresults.xml
index 98605b7..1c5a54a 100644
--- a/testresults.xml
+++ b/testresults.xml
@@ -12,12 +12,12 @@
 		>
 		<testcase
 			name="vhp_decode_test" 
-			classname="bin/varnishd/vhp_decode_test" 
+			classname="bin/varnishd.vhp_decode_test" 
 		>
 		</testcase>
 		<testcase
 			name="vhp_table_test" 
-			classname="bin/varnishd/vhp_table_test" 
+			classname="bin/varnishd.vhp_table_test" 
 		>
 		</testcase>
 	</testsuite>
@@ -30,1132 +30,1132 @@
 		>
 		<testcase
 			name="M00000" 
-			classname="bin/varnishtest/tests/M00000" 
+			classname="bin/varnishtest/tests.M00000" 
 		>
 		</testcase>
 		<testcase
 			name="M00001" 
-			classname="bin/varnishtest/tests/M00001" 
+			classname="bin/varnishtest/tests.M00001" 
 		>
 		</testcase>
 		<testcase
 			name="M00002" 
-			classname="bin/varnishtest/tests/M00002" 
+			classname="bin/varnishtest/tests.M00002" 
 		>
 		</testcase>
 		<testcase
 			name="M00003" 
-			classname="bin/varnishtest/tests/M00003" 
+			classname="bin/varnishtest/tests.M00003" 
 		>
 		</testcase>
 		<testcase
 			name="M00004" 
-			classname="bin/varnishtest/tests/M00004" 
+			classname="bin/varnishtest/tests.M00004" 
 		>
 		</testcase>
 		<testcase
 			name="M00005" 
-			classname="bin/varnishtest/tests/M00005" 
+			classname="bin/varnishtest/tests.M00005" 
 		>
 		</testcase>
 		<testcase
 			name="M00006" 
-			classname="bin/varnishtest/tests/M00006" 
+			classname="bin/varnishtest/tests.M00006" 
 		>
 		</testcase>
 		<testcase
 			name="M00007" 
-			classname="bin/varnishtest/tests/M00007" 
+			classname="bin/varnishtest/tests.M00007" 
 		>
 		</testcase>
 		<testcase
 			name="M00008" 
-			classname="bin/varnishtest/tests/M00008" 
+			classname="bin/varnishtest/tests.M00008" 
 		>
 		</testcase>
 		<testcase
 			name="M00009" 
-			classname="bin/varnishtest/tests/M00009" 
+			classname="bin/varnishtest/tests.M00009" 
 		>
 		</testcase>
 		<testcase
 			name="M00010" 
-			classname="bin/varnishtest/tests/M00010" 
+			classname="bin/varnishtest/tests.M00010" 
 		>
 		</testcase>
 		<testcase
 			name="M00011" 
-			classname="bin/varnishtest/tests/M00011" 
+			classname="bin/varnishtest/tests.M00011" 
 		>
 		</testcase>
 		<testcase
 			name="M00012" 
-			classname="bin/varnishtest/tests/M00012" 
+			classname="bin/varnishtest/tests.M00012" 
 		>
 		</testcase>
 		<testcase
 			name="M00013" 
-			classname="bin/varnishtest/tests/M00013" 
+			classname="bin/varnishtest/tests.M00013" 
 		>
 		</testcase>
 		<testcase
 			name="M00014" 
-			classname="bin/varnishtest/tests/M00014" 
+			classname="bin/varnishtest/tests.M00014" 
 		>
 		</testcase>
 		<testcase
 			name="M00015" 
-			classname="bin/varnishtest/tests/M00015" 
+			classname="bin/varnishtest/tests.M00015" 
 		>
 		</testcase>
 		<testcase
 			name="M00016" 
-			classname="bin/varnishtest/tests/M00016" 
+			classname="bin/varnishtest/tests.M00016" 
 		>
 		</testcase>
 		<testcase
 			name="M00017" 
-			classname="bin/varnishtest/tests/M00017" 
+			classname="bin/varnishtest/tests.M00017" 
 		>
 		</testcase>
 		<testcase
 			name="M00018" 
-			classname="bin/varnishtest/tests/M00018" 
+			classname="bin/varnishtest/tests.M00018" 
 		>
 		</testcase>
 		<testcase
 			name="M00019" 
-			classname="bin/varnishtest/tests/M00019" 
+			classname="bin/varnishtest/tests.M00019" 
 		>
 		</testcase>
 		<testcase
 			name="M00020" 
-			classname="bin/varnishtest/tests/M00020" 
+			classname="bin/varnishtest/tests.M00020" 
 		>
 		</testcase>
 		<testcase
 			name="M00021" 
-			classname="bin/varnishtest/tests/M00021" 
+			classname="bin/varnishtest/tests.M00021" 
 		>
 		</testcase>
 		<testcase
 			name="M00022" 
-			classname="bin/varnishtest/tests/M00022" 
+			classname="bin/varnishtest/tests.M00022" 
 		>
 		</testcase>
 		<testcase
 			name="M00023" 
-			classname="bin/varnishtest/tests/M00023" 
+			classname="bin/varnishtest/tests.M00023" 
 		>
 		</testcase>
 		<testcase
 			name="M00025" 
-			classname="bin/varnishtest/tests/M00025" 
+			classname="bin/varnishtest/tests.M00025" 
 		>
 		</testcase>
 		<testcase
 			name="P00001" 
-			classname="bin/varnishtest/tests/P00001" 
+			classname="bin/varnishtest/tests.P00001" 
 		>
 		</testcase>
 		<testcase
 			name="P00002" 
-			classname="bin/varnishtest/tests/P00002" 
+			classname="bin/varnishtest/tests.P00002" 
 		>
 		</testcase>
 		<testcase
 			name="a00000" 
-			classname="bin/varnishtest/tests/a00000" 
+			classname="bin/varnishtest/tests.a00000" 
 		>
 		</testcase>
 		<testcase
 			name="a00001" 
-			classname="bin/varnishtest/tests/a00001" 
+			classname="bin/varnishtest/tests.a00001" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="a00002" 
-			classname="bin/varnishtest/tests/a00002" 
+			classname="bin/varnishtest/tests.a00002" 
 		>
 		</testcase>
 		<testcase
 			name="a00003" 
-			classname="bin/varnishtest/tests/a00003" 
+			classname="bin/varnishtest/tests.a00003" 
 		>
 		</testcase>
 		<testcase
 			name="a00004" 
-			classname="bin/varnishtest/tests/a00004" 
+			classname="bin/varnishtest/tests.a00004" 
 		>
 		</testcase>
 		<testcase
 			name="a00005" 
-			classname="bin/varnishtest/tests/a00005" 
+			classname="bin/varnishtest/tests.a00005" 
 		>
 		</testcase>
 		<testcase
 			name="a00006" 
-			classname="bin/varnishtest/tests/a00006" 
+			classname="bin/varnishtest/tests.a00006" 
 		>
 		</testcase>
 		<testcase
 			name="a00007" 
-			classname="bin/varnishtest/tests/a00007" 
+			classname="bin/varnishtest/tests.a00007" 
 		>
 		</testcase>
 		<testcase
 			name="a00008" 
-			classname="bin/varnishtest/tests/a00008" 
+			classname="bin/varnishtest/tests.a00008" 
 		>
 		</testcase>
 		<testcase
 			name="a00009" 
-			classname="bin/varnishtest/tests/a00009" 
+			classname="bin/varnishtest/tests.a00009" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="a00010" 
-			classname="bin/varnishtest/tests/a00010" 
+			classname="bin/varnishtest/tests.a00010" 
 		>
 		</testcase>
 		<testcase
 			name="a00011" 
-			classname="bin/varnishtest/tests/a00011" 
+			classname="bin/varnishtest/tests.a00011" 
 		>
 		</testcase>
 		<testcase
 			name="a00012" 
-			classname="bin/varnishtest/tests/a00012" 
+			classname="bin/varnishtest/tests.a00012" 
 		>
 		</testcase>
 		<testcase
 			name="a00013" 
-			classname="bin/varnishtest/tests/a00013" 
+			classname="bin/varnishtest/tests.a00013" 
 		>
 		</testcase>
 		<testcase
 			name="a00014" 
-			classname="bin/varnishtest/tests/a00014" 
+			classname="bin/varnishtest/tests.a00014" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="a00015" 
-			classname="bin/varnishtest/tests/a00015" 
+			classname="bin/varnishtest/tests.a00015" 
 		>
 		</testcase>
 		<testcase
 			name="a00016" 
-			classname="bin/varnishtest/tests/a00016" 
+			classname="bin/varnishtest/tests.a00016" 
 		>
 		</testcase>
 		<testcase
 			name="a00017" 
-			classname="bin/varnishtest/tests/a00017" 
+			classname="bin/varnishtest/tests.a00017" 
 		>
 		</testcase>
 		<testcase
 			name="a00018" 
-			classname="bin/varnishtest/tests/a00018" 
+			classname="bin/varnishtest/tests.a00018" 
 		>
 		</testcase>
 		<testcase
 			name="a00019" 
-			classname="bin/varnishtest/tests/a00019" 
+			classname="bin/varnishtest/tests.a00019" 
 		>
 		</testcase>
 		<testcase
 			name="a00020" 
-			classname="bin/varnishtest/tests/a00020" 
+			classname="bin/varnishtest/tests.a00020" 
 		>
 		</testcase>
 		<testcase
 			name="a02000" 
-			classname="bin/varnishtest/tests/a02000" 
+			classname="bin/varnishtest/tests.a02000" 
 		>
 		</testcase>
 		<testcase
 			name="a02001" 
-			classname="bin/varnishtest/tests/a02001" 
+			classname="bin/varnishtest/tests.a02001" 
 		>
 		</testcase>
 		<testcase
 			name="a02002" 
-			classname="bin/varnishtest/tests/a02002" 
+			classname="bin/varnishtest/tests.a02002" 
 		>
 		</testcase>
 		<testcase
 			name="a02003" 
-			classname="bin/varnishtest/tests/a02003" 
+			classname="bin/varnishtest/tests.a02003" 
 		>
 		</testcase>
 		<testcase
 			name="a02004" 
-			classname="bin/varnishtest/tests/a02004" 
+			classname="bin/varnishtest/tests.a02004" 
 		>
 		</testcase>
 		<testcase
 			name="a02005" 
-			classname="bin/varnishtest/tests/a02005" 
+			classname="bin/varnishtest/tests.a02005" 
 		>
 		</testcase>
 		<testcase
 			name="a02006" 
-			classname="bin/varnishtest/tests/a02006" 
+			classname="bin/varnishtest/tests.a02006" 
 		>
 		</testcase>
 		<testcase
 			name="a02007" 
-			classname="bin/varnishtest/tests/a02007" 
+			classname="bin/varnishtest/tests.a02007" 
 		>
 		</testcase>
 		<testcase
 			name="a02008" 
-			classname="bin/varnishtest/tests/a02008" 
+			classname="bin/varnishtest/tests.a02008" 
 		>
 		</testcase>
 		<testcase
 			name="a02009" 
-			classname="bin/varnishtest/tests/a02009" 
+			classname="bin/varnishtest/tests.a02009" 
 		>
 		</testcase>
 		<testcase
 			name="a02010" 
-			classname="bin/varnishtest/tests/a02010" 
+			classname="bin/varnishtest/tests.a02010" 
 		>
 		</testcase>
 		<testcase
 			name="a02011" 
-			classname="bin/varnishtest/tests/a02011" 
+			classname="bin/varnishtest/tests.a02011" 
 		>
 		</testcase>
 		<testcase
 			name="a02012" 
-			classname="bin/varnishtest/tests/a02012" 
+			classname="bin/varnishtest/tests.a02012" 
 		>
 		</testcase>
 		<testcase
 			name="a02013" 
-			classname="bin/varnishtest/tests/a02013" 
+			classname="bin/varnishtest/tests.a02013" 
 		>
 		</testcase>
 		<testcase
 			name="a02014" 
-			classname="bin/varnishtest/tests/a02014" 
+			classname="bin/varnishtest/tests.a02014" 
 		>
 		</testcase>
 		<testcase
 			name="a02015" 
-			classname="bin/varnishtest/tests/a02015" 
+			classname="bin/varnishtest/tests.a02015" 
 		>
 		</testcase>
 		<testcase
 			name="a02016" 
-			classname="bin/varnishtest/tests/a02016" 
+			classname="bin/varnishtest/tests.a02016" 
 		>
 		</testcase>
 		<testcase
 			name="a02017" 
-			classname="bin/varnishtest/tests/a02017" 
+			classname="bin/varnishtest/tests.a02017" 
 		>
 		</testcase>
 		<testcase
 			name="a02018" 
-			classname="bin/varnishtest/tests/a02018" 
+			classname="bin/varnishtest/tests.a02018" 
 		>
 		</testcase>
 		<testcase
 			name="a02019" 
-			classname="bin/varnishtest/tests/a02019" 
+			classname="bin/varnishtest/tests.a02019" 
 		>
 		</testcase>
 		<testcase
 			name="a02020" 
-			classname="bin/varnishtest/tests/a02020" 
+			classname="bin/varnishtest/tests.a02020" 
 		>
 		</testcase>
 		<testcase
 			name="a02021" 
-			classname="bin/varnishtest/tests/a02021" 
+			classname="bin/varnishtest/tests.a02021" 
 		>
 		</testcase>
 		<testcase
 			name="a02022" 
-			classname="bin/varnishtest/tests/a02022" 
+			classname="bin/varnishtest/tests.a02022" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="a02023" 
-			classname="bin/varnishtest/tests/a02023" 
+			classname="bin/varnishtest/tests.a02023" 
 		>
 		</testcase>
 		<testcase
 			name="a02024" 
-			classname="bin/varnishtest/tests/a02024" 
+			classname="bin/varnishtest/tests.a02024" 
 		>
 		</testcase>
 		<testcase
 			name="b00000" 
-			classname="bin/varnishtest/tests/b00000" 
+			classname="bin/varnishtest/tests.b00000" 
 		>
 		</testcase>
 		<testcase
 			name="b00001" 
-			classname="bin/varnishtest/tests/b00001" 
+			classname="bin/varnishtest/tests.b00001" 
 		>
 		</testcase>
 		<testcase
 			name="b00002" 
-			classname="bin/varnishtest/tests/b00002" 
+			classname="bin/varnishtest/tests.b00002" 
 		>
 		</testcase>
 		<testcase
 			name="b00003" 
-			classname="bin/varnishtest/tests/b00003" 
+			classname="bin/varnishtest/tests.b00003" 
 		>
 		</testcase>
 		<testcase
 			name="b00004" 
-			classname="bin/varnishtest/tests/b00004" 
+			classname="bin/varnishtest/tests.b00004" 
 		>
 		</testcase>
 		<testcase
 			name="b00005" 
-			classname="bin/varnishtest/tests/b00005" 
+			classname="bin/varnishtest/tests.b00005" 
 		>
 		</testcase>
 		<testcase
 			name="b00006" 
-			classname="bin/varnishtest/tests/b00006" 
+			classname="bin/varnishtest/tests.b00006" 
 		>
 		</testcase>
 		<testcase
 			name="b00007" 
-			classname="bin/varnishtest/tests/b00007" 
+			classname="bin/varnishtest/tests.b00007" 
 		>
 		</testcase>
 		<testcase
 			name="b00008" 
-			classname="bin/varnishtest/tests/b00008" 
+			classname="bin/varnishtest/tests.b00008" 
 		>
 		</testcase>
 		<testcase
 			name="b00009" 
-			classname="bin/varnishtest/tests/b00009" 
+			classname="bin/varnishtest/tests.b00009" 
 		>
 		</testcase>
 		<testcase
 			name="b00010" 
-			classname="bin/varnishtest/tests/b00010" 
+			classname="bin/varnishtest/tests.b00010" 
 		>
 		</testcase>
 		<testcase
 			name="b00011" 
-			classname="bin/varnishtest/tests/b00011" 
+			classname="bin/varnishtest/tests.b00011" 
 		>
 		</testcase>
 		<testcase
 			name="b00012" 
-			classname="bin/varnishtest/tests/b00012" 
+			classname="bin/varnishtest/tests.b00012" 
 		>
 		</testcase>
 		<testcase
 			name="b00013" 
-			classname="bin/varnishtest/tests/b00013" 
+			classname="bin/varnishtest/tests.b00013" 
 		>
 		</testcase>
 		<testcase
 			name="b00014" 
-			classname="bin/varnishtest/tests/b00014" 
+			classname="bin/varnishtest/tests.b00014" 
 		>
 		</testcase>
 		<testcase
 			name="b00015" 
-			classname="bin/varnishtest/tests/b00015" 
+			classname="bin/varnishtest/tests.b00015" 
 		>
 		</testcase>
 		<testcase
 			name="b00016" 
-			classname="bin/varnishtest/tests/b00016" 
+			classname="bin/varnishtest/tests.b00016" 
 		>
 		</testcase>
 		<testcase
 			name="b00017" 
-			classname="bin/varnishtest/tests/b00017" 
+			classname="bin/varnishtest/tests.b00017" 
 		>
 		</testcase>
 		<testcase
 			name="b00018" 
-			classname="bin/varnishtest/tests/b00018" 
+			classname="bin/varnishtest/tests.b00018" 
 		>
 		</testcase>
 		<testcase
 			name="b00019" 
-			classname="bin/varnishtest/tests/b00019" 
+			classname="bin/varnishtest/tests.b00019" 
 		>
 		</testcase>
 		<testcase
 			name="b00020" 
-			classname="bin/varnishtest/tests/b00020" 
+			classname="bin/varnishtest/tests.b00020" 
 		>
 		</testcase>
 		<testcase
 			name="b00021" 
-			classname="bin/varnishtest/tests/b00021" 
+			classname="bin/varnishtest/tests.b00021" 
 		>
 		</testcase>
 		<testcase
 			name="b00022" 
-			classname="bin/varnishtest/tests/b00022" 
+			classname="bin/varnishtest/tests.b00022" 
 		>
 		</testcase>
 		<testcase
 			name="b00023" 
-			classname="bin/varnishtest/tests/b00023" 
+			classname="bin/varnishtest/tests.b00023" 
 		>
 		</testcase>
 		<testcase
 			name="b00024" 
-			classname="bin/varnishtest/tests/b00024" 
+			classname="bin/varnishtest/tests.b00024" 
 		>
 		</testcase>
 		<testcase
 			name="b00025" 
-			classname="bin/varnishtest/tests/b00025" 
+			classname="bin/varnishtest/tests.b00025" 
 		>
 		</testcase>
 		<testcase
 			name="b00026" 
-			classname="bin/varnishtest/tests/b00026" 
+			classname="bin/varnishtest/tests.b00026" 
 		>
 		</testcase>
 		<testcase
 			name="b00027" 
-			classname="bin/varnishtest/tests/b00027" 
+			classname="bin/varnishtest/tests.b00027" 
 		>
 		</testcase>
 		<testcase
 			name="b00028" 
-			classname="bin/varnishtest/tests/b00028" 
+			classname="bin/varnishtest/tests.b00028" 
 		>
 		</testcase>
 		<testcase
 			name="b00029" 
-			classname="bin/varnishtest/tests/b00029" 
+			classname="bin/varnishtest/tests.b00029" 
 		>
 		</testcase>
 		<testcase
 			name="b00030" 
-			classname="bin/varnishtest/tests/b00030" 
+			classname="bin/varnishtest/tests.b00030" 
 		>
 		</testcase>
 		<testcase
 			name="b00031" 
-			classname="bin/varnishtest/tests/b00031" 
+			classname="bin/varnishtest/tests.b00031" 
 		>
 		</testcase>
 		<testcase
 			name="b00032" 
-			classname="bin/varnishtest/tests/b00032" 
+			classname="bin/varnishtest/tests.b00032" 
 		>
 		</testcase>
 		<testcase
 			name="b00033" 
-			classname="bin/varnishtest/tests/b00033" 
+			classname="bin/varnishtest/tests.b00033" 
 		>
 		</testcase>
 		<testcase
 			name="b00034" 
-			classname="bin/varnishtest/tests/b00034" 
+			classname="bin/varnishtest/tests.b00034" 
 		>
 		</testcase>
 		<testcase
 			name="b00036" 
-			classname="bin/varnishtest/tests/b00036" 
+			classname="bin/varnishtest/tests.b00036" 
 		>
 		</testcase>
 		<testcase
 			name="b00037" 
-			classname="bin/varnishtest/tests/b00037" 
+			classname="bin/varnishtest/tests.b00037" 
 		>
 		</testcase>
 		<testcase
 			name="b00038" 
-			classname="bin/varnishtest/tests/b00038" 
+			classname="bin/varnishtest/tests.b00038" 
 		>
 		</testcase>
 		<testcase
 			name="b00039" 
-			classname="bin/varnishtest/tests/b00039" 
+			classname="bin/varnishtest/tests.b00039" 
 		>
 		</testcase>
 		<testcase
 			name="b00040" 
-			classname="bin/varnishtest/tests/b00040" 
+			classname="bin/varnishtest/tests.b00040" 
 		>
 		</testcase>
 		<testcase
 			name="b00041" 
-			classname="bin/varnishtest/tests/b00041" 
+			classname="bin/varnishtest/tests.b00041" 
 		>
 		</testcase>
 		<testcase
 			name="b00042" 
-			classname="bin/varnishtest/tests/b00042" 
+			classname="bin/varnishtest/tests.b00042" 
 		>
 		</testcase>
 		<testcase
 			name="b00043" 
-			classname="bin/varnishtest/tests/b00043" 
+			classname="bin/varnishtest/tests.b00043" 
 		>
 		</testcase>
 		<testcase
 			name="b00044" 
-			classname="bin/varnishtest/tests/b00044" 
+			classname="bin/varnishtest/tests.b00044" 
 		>
 		</testcase>
 		<testcase
 			name="b00045" 
-			classname="bin/varnishtest/tests/b00045" 
+			classname="bin/varnishtest/tests.b00045" 
 		>
 		</testcase>
 		<testcase
 			name="b00046" 
-			classname="bin/varnishtest/tests/b00046" 
+			classname="bin/varnishtest/tests.b00046" 
 		>
 		</testcase>
 		<testcase
 			name="b00047" 
-			classname="bin/varnishtest/tests/b00047" 
+			classname="bin/varnishtest/tests.b00047" 
 		>
 		</testcase>
 		<testcase
 			name="b00048" 
-			classname="bin/varnishtest/tests/b00048" 
+			classname="bin/varnishtest/tests.b00048" 
 		>
 		</testcase>
 		<testcase
 			name="b00049" 
-			classname="bin/varnishtest/tests/b00049" 
+			classname="bin/varnishtest/tests.b00049" 
 		>
 		</testcase>
 		<testcase
 			name="b00050" 
-			classname="bin/varnishtest/tests/b00050" 
+			classname="bin/varnishtest/tests.b00050" 
 		>
 		</testcase>
 		<testcase
 			name="b00051" 
-			classname="bin/varnishtest/tests/b00051" 
+			classname="bin/varnishtest/tests.b00051" 
 		>
 		</testcase>
 		<testcase
 			name="b00052" 
-			classname="bin/varnishtest/tests/b00052" 
+			classname="bin/varnishtest/tests.b00052" 
 		>
 		</testcase>
 		<testcase
 			name="b00053" 
-			classname="bin/varnishtest/tests/b00053" 
+			classname="bin/varnishtest/tests.b00053" 
 		>
 		</testcase>
 		<testcase
 			name="b00054" 
-			classname="bin/varnishtest/tests/b00054" 
+			classname="bin/varnishtest/tests.b00054" 
 		>
 		</testcase>
 		<testcase
 			name="b00055" 
-			classname="bin/varnishtest/tests/b00055" 
+			classname="bin/varnishtest/tests.b00055" 
 		>
 		</testcase>
 		<testcase
 			name="b00056" 
-			classname="bin/varnishtest/tests/b00056" 
+			classname="bin/varnishtest/tests.b00056" 
 		>
 		</testcase>
 		<testcase
 			name="b00057" 
-			classname="bin/varnishtest/tests/b00057" 
+			classname="bin/varnishtest/tests.b00057" 
 		>
 		</testcase>
 		<testcase
 			name="b00059" 
-			classname="bin/varnishtest/tests/b00059" 
+			classname="bin/varnishtest/tests.b00059" 
 		>
 		</testcase>
 		<testcase
 			name="b00060" 
-			classname="bin/varnishtest/tests/b00060" 
+			classname="bin/varnishtest/tests.b00060" 
 		>
 		</testcase>
 		<testcase
 			name="b00061" 
-			classname="bin/varnishtest/tests/b00061" 
+			classname="bin/varnishtest/tests.b00061" 
 		>
 		</testcase>
 		<testcase
 			name="b00062" 
-			classname="bin/varnishtest/tests/b00062" 
+			classname="bin/varnishtest/tests.b00062" 
 		>
 		</testcase>
 		<testcase
 			name="b00063" 
-			classname="bin/varnishtest/tests/b00063" 
+			classname="bin/varnishtest/tests.b00063" 
 		>
 		</testcase>
 		<testcase
 			name="b00064" 
-			classname="bin/varnishtest/tests/b00064" 
+			classname="bin/varnishtest/tests.b00064" 
 		>
 		</testcase>
 		<testcase
 			name="b00065" 
-			classname="bin/varnishtest/tests/b00065" 
+			classname="bin/varnishtest/tests.b00065" 
 		>
 		</testcase>
 		<testcase
 			name="c00001" 
-			classname="bin/varnishtest/tests/c00001" 
+			classname="bin/varnishtest/tests.c00001" 
 		>
 		</testcase>
 		<testcase
 			name="c00002" 
-			classname="bin/varnishtest/tests/c00002" 
+			classname="bin/varnishtest/tests.c00002" 
 		>
 		</testcase>
 		<testcase
 			name="c00003" 
-			classname="bin/varnishtest/tests/c00003" 
+			classname="bin/varnishtest/tests.c00003" 
 		>
 		</testcase>
 		<testcase
 			name="c00004" 
-			classname="bin/varnishtest/tests/c00004" 
+			classname="bin/varnishtest/tests.c00004" 
 		>
 		</testcase>
 		<testcase
 			name="c00005" 
-			classname="bin/varnishtest/tests/c00005" 
+			classname="bin/varnishtest/tests.c00005" 
 		>
 		</testcase>
 		<testcase
 			name="c00006" 
-			classname="bin/varnishtest/tests/c00006" 
+			classname="bin/varnishtest/tests.c00006" 
 		>
 		</testcase>
 		<testcase
 			name="c00007" 
-			classname="bin/varnishtest/tests/c00007" 
+			classname="bin/varnishtest/tests.c00007" 
 		>
 		</testcase>
 		<testcase
 			name="c00008" 
-			classname="bin/varnishtest/tests/c00008" 
+			classname="bin/varnishtest/tests.c00008" 
 		>
 		</testcase>
 		<testcase
 			name="c00009" 
-			classname="bin/varnishtest/tests/c00009" 
+			classname="bin/varnishtest/tests.c00009" 
 		>
 		</testcase>
 		<testcase
 			name="c00010" 
-			classname="bin/varnishtest/tests/c00010" 
+			classname="bin/varnishtest/tests.c00010" 
 		>
 		</testcase>
 		<testcase
 			name="c00011" 
-			classname="bin/varnishtest/tests/c00011" 
+			classname="bin/varnishtest/tests.c00011" 
 		>
 		</testcase>
 		<testcase
 			name="c00012" 
-			classname="bin/varnishtest/tests/c00012" 
+			classname="bin/varnishtest/tests.c00012" 
 		>
 		</testcase>
 		<testcase
 			name="c00013" 
-			classname="bin/varnishtest/tests/c00013" 
+			classname="bin/varnishtest/tests.c00013" 
 		>
 		</testcase>
 		<testcase
 			name="c00014" 
-			classname="bin/varnishtest/tests/c00014" 
+			classname="bin/varnishtest/tests.c00014" 
 		>
 		</testcase>
 		<testcase
 			name="c00015" 
-			classname="bin/varnishtest/tests/c00015" 
+			classname="bin/varnishtest/tests.c00015" 
 		>
 		</testcase>
 		<testcase
 			name="c00016" 
-			classname="bin/varnishtest/tests/c00016" 
+			classname="bin/varnishtest/tests.c00016" 
 		>
 		</testcase>
 		<testcase
 			name="c00017" 
-			classname="bin/varnishtest/tests/c00017" 
+			classname="bin/varnishtest/tests.c00017" 
 		>
 		</testcase>
 		<testcase
 			name="c00018" 
-			classname="bin/varnishtest/tests/c00018" 
+			classname="bin/varnishtest/tests.c00018" 
 		>
 		</testcase>
 		<testcase
 			name="c00019" 
-			classname="bin/varnishtest/tests/c00019" 
+			classname="bin/varnishtest/tests.c00019" 
 		>
 		</testcase>
 		<testcase
 			name="c00020" 
-			classname="bin/varnishtest/tests/c00020" 
+			classname="bin/varnishtest/tests.c00020" 
 		>
 		</testcase>
 		<testcase
 			name="c00021" 
-			classname="bin/varnishtest/tests/c00021" 
+			classname="bin/varnishtest/tests.c00021" 
 		>
 		</testcase>
 		<testcase
 			name="c00022" 
-			classname="bin/varnishtest/tests/c00022" 
+			classname="bin/varnishtest/tests.c00022" 
 		>
 		</testcase>
 		<testcase
 			name="c00023" 
-			classname="bin/varnishtest/tests/c00023" 
+			classname="bin/varnishtest/tests.c00023" 
 		>
 		</testcase>
 		<testcase
 			name="c00024" 
-			classname="bin/varnishtest/tests/c00024" 
+			classname="bin/varnishtest/tests.c00024" 
 		>
 		</testcase>
 		<testcase
 			name="c00025" 
-			classname="bin/varnishtest/tests/c00025" 
+			classname="bin/varnishtest/tests.c00025" 
 		>
 		</testcase>
 		<testcase
 			name="c00026" 
-			classname="bin/varnishtest/tests/c00026" 
+			classname="bin/varnishtest/tests.c00026" 
 		>
 		</testcase>
 		<testcase
 			name="c00027" 
-			classname="bin/varnishtest/tests/c00027" 
+			classname="bin/varnishtest/tests.c00027" 
 		>
 		</testcase>
 		<testcase
 			name="c00028" 
-			classname="bin/varnishtest/tests/c00028" 
+			classname="bin/varnishtest/tests.c00028" 
 		>
 		</testcase>
 		<testcase
 			name="c00031" 
-			classname="bin/varnishtest/tests/c00031" 
+			classname="bin/varnishtest/tests.c00031" 
 		>
 		</testcase>
 		<testcase
 			name="c00034" 
-			classname="bin/varnishtest/tests/c00034" 
+			classname="bin/varnishtest/tests.c00034" 
 		>
 		</testcase>
 		<testcase
 			name="c00035" 
-			classname="bin/varnishtest/tests/c00035" 
+			classname="bin/varnishtest/tests.c00035" 
 		>
 		</testcase>
 		<testcase
 			name="c00036" 
-			classname="bin/varnishtest/tests/c00036" 
+			classname="bin/varnishtest/tests.c00036" 
 		>
 		</testcase>
 		<testcase
 			name="c00037" 
-			classname="bin/varnishtest/tests/c00037" 
+			classname="bin/varnishtest/tests.c00037" 
 		>
 		</testcase>
 		<testcase
 			name="c00038" 
-			classname="bin/varnishtest/tests/c00038" 
+			classname="bin/varnishtest/tests.c00038" 
 		>
 		</testcase>
 		<testcase
 			name="c00039" 
-			classname="bin/varnishtest/tests/c00039" 
+			classname="bin/varnishtest/tests.c00039" 
 		>
 		</testcase>
 		<testcase
 			name="c00040" 
-			classname="bin/varnishtest/tests/c00040" 
+			classname="bin/varnishtest/tests.c00040" 
 		>
 		</testcase>
 		<testcase
 			name="c00041" 
-			classname="bin/varnishtest/tests/c00041" 
+			classname="bin/varnishtest/tests.c00041" 
 		>
 		</testcase>
 		<testcase
 			name="c00043" 
-			classname="bin/varnishtest/tests/c00043" 
+			classname="bin/varnishtest/tests.c00043" 
 		>
 		</testcase>
 		<testcase
 			name="c00044" 
-			classname="bin/varnishtest/tests/c00044" 
+			classname="bin/varnishtest/tests.c00044" 
 		>
 		</testcase>
 		<testcase
 			name="c00045" 
-			classname="bin/varnishtest/tests/c00045" 
+			classname="bin/varnishtest/tests.c00045" 
 		>
 		</testcase>
 		<testcase
 			name="c00046" 
-			classname="bin/varnishtest/tests/c00046" 
+			classname="bin/varnishtest/tests.c00046" 
 		>
 		</testcase>
 		<testcase
 			name="c00047" 
-			classname="bin/varnishtest/tests/c00047" 
+			classname="bin/varnishtest/tests.c00047" 
 		>
 		</testcase>
 		<testcase
 			name="c00048" 
-			classname="bin/varnishtest/tests/c00048" 
+			classname="bin/varnishtest/tests.c00048" 
 		>
 		</testcase>
 		<testcase
 			name="c00049" 
-			classname="bin/varnishtest/tests/c00049" 
+			classname="bin/varnishtest/tests.c00049" 
 		>
 		</testcase>
 		<testcase
 			name="c00050" 
-			classname="bin/varnishtest/tests/c00050" 
+			classname="bin/varnishtest/tests.c00050" 
 		>
 		</testcase>
 		<testcase
 			name="c00051" 
-			classname="bin/varnishtest/tests/c00051" 
+			classname="bin/varnishtest/tests.c00051" 
 		>
 		</testcase>
 		<testcase
 			name="c00052" 
-			classname="bin/varnishtest/tests/c00052" 
+			classname="bin/varnishtest/tests.c00052" 
 		>
 		</testcase>
 		<testcase
 			name="c00053" 
-			classname="bin/varnishtest/tests/c00053" 
+			classname="bin/varnishtest/tests.c00053" 
 		>
 		</testcase>
 		<testcase
 			name="c00054" 
-			classname="bin/varnishtest/tests/c00054" 
+			classname="bin/varnishtest/tests.c00054" 
 		>
 		</testcase>
 		<testcase
 			name="c00055" 
-			classname="bin/varnishtest/tests/c00055" 
+			classname="bin/varnishtest/tests.c00055" 
 		>
 		</testcase>
 		<testcase
 			name="c00056" 
-			classname="bin/varnishtest/tests/c00056" 
+			classname="bin/varnishtest/tests.c00056" 
 		>
 		</testcase>
 		<testcase
 			name="c00057" 
-			classname="bin/varnishtest/tests/c00057" 
+			classname="bin/varnishtest/tests.c00057" 
 		>
 		</testcase>
 		<testcase
 			name="c00058" 
-			classname="bin/varnishtest/tests/c00058" 
+			classname="bin/varnishtest/tests.c00058" 
 		>
 		</testcase>
 		<testcase
 			name="c00059" 
-			classname="bin/varnishtest/tests/c00059" 
+			classname="bin/varnishtest/tests.c00059" 
 		>
 		</testcase>
 		<testcase
 			name="c00060" 
-			classname="bin/varnishtest/tests/c00060" 
+			classname="bin/varnishtest/tests.c00060" 
 		>
 		</testcase>
 		<testcase
 			name="c00061" 
-			classname="bin/varnishtest/tests/c00061" 
+			classname="bin/varnishtest/tests.c00061" 
 		>
 		</testcase>
 		<testcase
 			name="c00062" 
-			classname="bin/varnishtest/tests/c00062" 
+			classname="bin/varnishtest/tests.c00062" 
 		>
 		</testcase>
 		<testcase
 			name="c00063" 
-			classname="bin/varnishtest/tests/c00063" 
+			classname="bin/varnishtest/tests.c00063" 
 		>
 		</testcase>
 		<testcase
 			name="c00064" 
-			classname="bin/varnishtest/tests/c00064" 
+			classname="bin/varnishtest/tests.c00064" 
 		>
 		</testcase>
 		<testcase
 			name="c00065" 
-			classname="bin/varnishtest/tests/c00065" 
+			classname="bin/varnishtest/tests.c00065" 
 		>
 		</testcase>
 		<testcase
 			name="c00066" 
-			classname="bin/varnishtest/tests/c00066" 
+			classname="bin/varnishtest/tests.c00066" 
 		>
 		</testcase>
 		<testcase
 			name="c00067" 
-			classname="bin/varnishtest/tests/c00067" 
+			classname="bin/varnishtest/tests.c00067" 
 		>
 		</testcase>
 		<testcase
 			name="c00068" 
-			classname="bin/varnishtest/tests/c00068" 
+			classname="bin/varnishtest/tests.c00068" 
 		>
 		</testcase>
 		<testcase
 			name="c00069" 
-			classname="bin/varnishtest/tests/c00069" 
+			classname="bin/varnishtest/tests.c00069" 
 		>
 		</testcase>
 		<testcase
 			name="c00070" 
-			classname="bin/varnishtest/tests/c00070" 
+			classname="bin/varnishtest/tests.c00070" 
 		>
 		</testcase>
 		<testcase
 			name="c00071" 
-			classname="bin/varnishtest/tests/c00071" 
+			classname="bin/varnishtest/tests.c00071" 
 		>
 		</testcase>
 		<testcase
 			name="c00072" 
-			classname="bin/varnishtest/tests/c00072" 
+			classname="bin/varnishtest/tests.c00072" 
 		>
 		</testcase>
 		<testcase
 			name="c00073" 
-			classname="bin/varnishtest/tests/c00073" 
+			classname="bin/varnishtest/tests.c00073" 
 		>
 		</testcase>
 		<testcase
 			name="c00074" 
-			classname="bin/varnishtest/tests/c00074" 
+			classname="bin/varnishtest/tests.c00074" 
 		>
 		</testcase>
 		<testcase
 			name="c00075" 
-			classname="bin/varnishtest/tests/c00075" 
+			classname="bin/varnishtest/tests.c00075" 
 		>
 		</testcase>
 		<testcase
 			name="c00076" 
-			classname="bin/varnishtest/tests/c00076" 
+			classname="bin/varnishtest/tests.c00076" 
 		>
 		</testcase>
 		<testcase
 			name="c00077" 
-			classname="bin/varnishtest/tests/c00077" 
+			classname="bin/varnishtest/tests.c00077" 
 		>
 		</testcase>
 		<testcase
 			name="c00078" 
-			classname="bin/varnishtest/tests/c00078" 
+			classname="bin/varnishtest/tests.c00078" 
 		>
 		</testcase>
 		<testcase
 			name="c00079" 
-			classname="bin/varnishtest/tests/c00079" 
+			classname="bin/varnishtest/tests.c00079" 
 		>
 		</testcase>
 		<testcase
 			name="c00080" 
-			classname="bin/varnishtest/tests/c00080" 
+			classname="bin/varnishtest/tests.c00080" 
 		>
 		</testcase>
 		<testcase
 			name="c00081" 
-			classname="bin/varnishtest/tests/c00081" 
+			classname="bin/varnishtest/tests.c00081" 
 		>
 		</testcase>
 		<testcase
 			name="c00082" 
-			classname="bin/varnishtest/tests/c00082" 
+			classname="bin/varnishtest/tests.c00082" 
 		>
 		</testcase>
 		<testcase
 			name="c00084" 
-			classname="bin/varnishtest/tests/c00084" 
+			classname="bin/varnishtest/tests.c00084" 
 		>
 		</testcase>
 		<testcase
 			name="c00085" 
-			classname="bin/varnishtest/tests/c00085" 
+			classname="bin/varnishtest/tests.c00085" 
 		>
 		</testcase>
 		<testcase
 			name="c00086" 
-			classname="bin/varnishtest/tests/c00086" 
+			classname="bin/varnishtest/tests.c00086" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="c00087" 
-			classname="bin/varnishtest/tests/c00087" 
+			classname="bin/varnishtest/tests.c00087" 
 		>
 		</testcase>
 		<testcase
 			name="c00088" 
-			classname="bin/varnishtest/tests/c00088" 
+			classname="bin/varnishtest/tests.c00088" 
 		>
 		</testcase>
 		<testcase
 			name="c00089" 
-			classname="bin/varnishtest/tests/c00089" 
+			classname="bin/varnishtest/tests.c00089" 
 		>
 		</testcase>
 		<testcase
 			name="c00090" 
-			classname="bin/varnishtest/tests/c00090" 
+			classname="bin/varnishtest/tests.c00090" 
 		>
 		</testcase>
 		<testcase
 			name="c00091" 
-			classname="bin/varnishtest/tests/c00091" 
+			classname="bin/varnishtest/tests.c00091" 
 		>
 		</testcase>
 		<testcase
 			name="c00092" 
-			classname="bin/varnishtest/tests/c00092" 
+			classname="bin/varnishtest/tests.c00092" 
 		>
 		</testcase>
 		<testcase
 			name="c00093" 
-			classname="bin/varnishtest/tests/c00093" 
+			classname="bin/varnishtest/tests.c00093" 
 		>
 		</testcase>
 		<testcase
 			name="c00094" 
-			classname="bin/varnishtest/tests/c00094" 
+			classname="bin/varnishtest/tests.c00094" 
 		>
 			<failure
 				type=":test-result: FAIL"
@@ -1683,2720 +1683,2720 @@ FAIL tests/c00094.vtc (exit status: 2)
 		</testcase>
 		<testcase
 			name="d00000" 
-			classname="bin/varnishtest/tests/d00000" 
+			classname="bin/varnishtest/tests.d00000" 
 		>
 		</testcase>
 		<testcase
 			name="d00001" 
-			classname="bin/varnishtest/tests/d00001" 
+			classname="bin/varnishtest/tests.d00001" 
 		>
 		</testcase>
 		<testcase
 			name="d00002" 
-			classname="bin/varnishtest/tests/d00002" 
+			classname="bin/varnishtest/tests.d00002" 
 		>
 		</testcase>
 		<testcase
 			name="d00003" 
-			classname="bin/varnishtest/tests/d00003" 
+			classname="bin/varnishtest/tests.d00003" 
 		>
 		</testcase>
 		<testcase
 			name="d00004" 
-			classname="bin/varnishtest/tests/d00004" 
+			classname="bin/varnishtest/tests.d00004" 
 		>
 		</testcase>
 		<testcase
 			name="d00005" 
-			classname="bin/varnishtest/tests/d00005" 
+			classname="bin/varnishtest/tests.d00005" 
 		>
 		</testcase>
 		<testcase
 			name="d00006" 
-			classname="bin/varnishtest/tests/d00006" 
+			classname="bin/varnishtest/tests.d00006" 
 		>
 		</testcase>
 		<testcase
 			name="d00007" 
-			classname="bin/varnishtest/tests/d00007" 
+			classname="bin/varnishtest/tests.d00007" 
 		>
 		</testcase>
 		<testcase
 			name="d00008" 
-			classname="bin/varnishtest/tests/d00008" 
+			classname="bin/varnishtest/tests.d00008" 
 		>
 		</testcase>
 		<testcase
 			name="d00009" 
-			classname="bin/varnishtest/tests/d00009" 
+			classname="bin/varnishtest/tests.d00009" 
 		>
 		</testcase>
 		<testcase
 			name="d00010" 
-			classname="bin/varnishtest/tests/d00010" 
+			classname="bin/varnishtest/tests.d00010" 
 		>
 		</testcase>
 		<testcase
 			name="d00011" 
-			classname="bin/varnishtest/tests/d00011" 
+			classname="bin/varnishtest/tests.d00011" 
 		>
 		</testcase>
 		<testcase
 			name="d00012" 
-			classname="bin/varnishtest/tests/d00012" 
+			classname="bin/varnishtest/tests.d00012" 
 		>
 		</testcase>
 		<testcase
 			name="d00013" 
-			classname="bin/varnishtest/tests/d00013" 
+			classname="bin/varnishtest/tests.d00013" 
 		>
 		</testcase>
 		<testcase
 			name="d00014" 
-			classname="bin/varnishtest/tests/d00014" 
+			classname="bin/varnishtest/tests.d00014" 
 		>
 		</testcase>
 		<testcase
 			name="d00015" 
-			classname="bin/varnishtest/tests/d00015" 
+			classname="bin/varnishtest/tests.d00015" 
 		>
 		</testcase>
 		<testcase
 			name="d00016" 
-			classname="bin/varnishtest/tests/d00016" 
+			classname="bin/varnishtest/tests.d00016" 
 		>
 		</testcase>
 		<testcase
 			name="d00017" 
-			classname="bin/varnishtest/tests/d00017" 
+			classname="bin/varnishtest/tests.d00017" 
 		>
 		</testcase>
 		<testcase
 			name="d00018" 
-			classname="bin/varnishtest/tests/d00018" 
+			classname="bin/varnishtest/tests.d00018" 
 		>
 		</testcase>
 		<testcase
 			name="d00019" 
-			classname="bin/varnishtest/tests/d00019" 
+			classname="bin/varnishtest/tests.d00019" 
 		>
 		</testcase>
 		<testcase
 			name="d00020" 
-			classname="bin/varnishtest/tests/d00020" 
+			classname="bin/varnishtest/tests.d00020" 
 		>
 		</testcase>
 		<testcase
 			name="d00021" 
-			classname="bin/varnishtest/tests/d00021" 
+			classname="bin/varnishtest/tests.d00021" 
 		>
 		</testcase>
 		<testcase
 			name="d00022" 
-			classname="bin/varnishtest/tests/d00022" 
+			classname="bin/varnishtest/tests.d00022" 
 		>
 		</testcase>
 		<testcase
 			name="d00023" 
-			classname="bin/varnishtest/tests/d00023" 
+			classname="bin/varnishtest/tests.d00023" 
 		>
 		</testcase>
 		<testcase
 			name="d00024" 
-			classname="bin/varnishtest/tests/d00024" 
+			classname="bin/varnishtest/tests.d00024" 
 		>
 		</testcase>
 		<testcase
 			name="d00025" 
-			classname="bin/varnishtest/tests/d00025" 
+			classname="bin/varnishtest/tests.d00025" 
 		>
 		</testcase>
 		<testcase
 			name="d00026" 
-			classname="bin/varnishtest/tests/d00026" 
+			classname="bin/varnishtest/tests.d00026" 
 		>
 		</testcase>
 		<testcase
 			name="d00027" 
-			classname="bin/varnishtest/tests/d00027" 
+			classname="bin/varnishtest/tests.d00027" 
 		>
 		</testcase>
 		<testcase
 			name="d00028" 
-			classname="bin/varnishtest/tests/d00028" 
+			classname="bin/varnishtest/tests.d00028" 
 		>
 		</testcase>
 		<testcase
 			name="d00029" 
-			classname="bin/varnishtest/tests/d00029" 
+			classname="bin/varnishtest/tests.d00029" 
 		>
 		</testcase>
 		<testcase
 			name="d00030" 
-			classname="bin/varnishtest/tests/d00030" 
+			classname="bin/varnishtest/tests.d00030" 
 		>
 		</testcase>
 		<testcase
 			name="d00031" 
-			classname="bin/varnishtest/tests/d00031" 
+			classname="bin/varnishtest/tests.d00031" 
 		>
 		</testcase>
 		<testcase
 			name="d00032" 
-			classname="bin/varnishtest/tests/d00032" 
+			classname="bin/varnishtest/tests.d00032" 
 		>
 		</testcase>
 		<testcase
 			name="d00033" 
-			classname="bin/varnishtest/tests/d00033" 
+			classname="bin/varnishtest/tests.d00033" 
 		>
 		</testcase>
 		<testcase
 			name="d00034" 
-			classname="bin/varnishtest/tests/d00034" 
+			classname="bin/varnishtest/tests.d00034" 
 		>
 		</testcase>
 		<testcase
 			name="d00035" 
-			classname="bin/varnishtest/tests/d00035" 
+			classname="bin/varnishtest/tests.d00035" 
 		>
 		</testcase>
 		<testcase
 			name="d00036" 
-			classname="bin/varnishtest/tests/d00036" 
+			classname="bin/varnishtest/tests.d00036" 
 		>
 		</testcase>
 		<testcase
 			name="d00037" 
-			classname="bin/varnishtest/tests/d00037" 
+			classname="bin/varnishtest/tests.d00037" 
 		>
 		</testcase>
 		<testcase
 			name="d00038" 
-			classname="bin/varnishtest/tests/d00038" 
+			classname="bin/varnishtest/tests.d00038" 
 		>
 		</testcase>
 		<testcase
 			name="e00000" 
-			classname="bin/varnishtest/tests/e00000" 
+			classname="bin/varnishtest/tests.e00000" 
 		>
 		</testcase>
 		<testcase
 			name="e00001" 
-			classname="bin/varnishtest/tests/e00001" 
+			classname="bin/varnishtest/tests.e00001" 
 		>
 		</testcase>
 		<testcase
 			name="e00002" 
-			classname="bin/varnishtest/tests/e00002" 
+			classname="bin/varnishtest/tests.e00002" 
 		>
 		</testcase>
 		<testcase
 			name="e00003" 
-			classname="bin/varnishtest/tests/e00003" 
+			classname="bin/varnishtest/tests.e00003" 
 		>
 		</testcase>
 		<testcase
 			name="e00004" 
-			classname="bin/varnishtest/tests/e00004" 
+			classname="bin/varnishtest/tests.e00004" 
 		>
 		</testcase>
 		<testcase
 			name="e00005" 
-			classname="bin/varnishtest/tests/e00005" 
+			classname="bin/varnishtest/tests.e00005" 
 		>
 		</testcase>
 		<testcase
 			name="e00006" 
-			classname="bin/varnishtest/tests/e00006" 
+			classname="bin/varnishtest/tests.e00006" 
 		>
 		</testcase>
 		<testcase
 			name="e00007" 
-			classname="bin/varnishtest/tests/e00007" 
+			classname="bin/varnishtest/tests.e00007" 
 		>
 		</testcase>
 		<testcase
 			name="e00008" 
-			classname="bin/varnishtest/tests/e00008" 
+			classname="bin/varnishtest/tests.e00008" 
 		>
 		</testcase>
 		<testcase
 			name="e00009" 
-			classname="bin/varnishtest/tests/e00009" 
+			classname="bin/varnishtest/tests.e00009" 
 		>
 		</testcase>
 		<testcase
 			name="e00010" 
-			classname="bin/varnishtest/tests/e00010" 
+			classname="bin/varnishtest/tests.e00010" 
 		>
 		</testcase>
 		<testcase
 			name="e00011" 
-			classname="bin/varnishtest/tests/e00011" 
+			classname="bin/varnishtest/tests.e00011" 
 		>
 		</testcase>
 		<testcase
 			name="e00012" 
-			classname="bin/varnishtest/tests/e00012" 
+			classname="bin/varnishtest/tests.e00012" 
 		>
 		</testcase>
 		<testcase
 			name="e00013" 
-			classname="bin/varnishtest/tests/e00013" 
+			classname="bin/varnishtest/tests.e00013" 
 		>
 		</testcase>
 		<testcase
 			name="e00014" 
-			classname="bin/varnishtest/tests/e00014" 
+			classname="bin/varnishtest/tests.e00014" 
 		>
 		</testcase>
 		<testcase
 			name="e00015" 
-			classname="bin/varnishtest/tests/e00015" 
+			classname="bin/varnishtest/tests.e00015" 
 		>
 		</testcase>
 		<testcase
 			name="e00016" 
-			classname="bin/varnishtest/tests/e00016" 
+			classname="bin/varnishtest/tests.e00016" 
 		>
 		</testcase>
 		<testcase
 			name="e00017" 
-			classname="bin/varnishtest/tests/e00017" 
+			classname="bin/varnishtest/tests.e00017" 
 		>
 		</testcase>
 		<testcase
 			name="e00018" 
-			classname="bin/varnishtest/tests/e00018" 
+			classname="bin/varnishtest/tests.e00018" 
 		>
 		</testcase>
 		<testcase
 			name="e00019" 
-			classname="bin/varnishtest/tests/e00019" 
+			classname="bin/varnishtest/tests.e00019" 
 		>
 		</testcase>
 		<testcase
 			name="e00020" 
-			classname="bin/varnishtest/tests/e00020" 
+			classname="bin/varnishtest/tests.e00020" 
 		>
 		</testcase>
 		<testcase
 			name="e00021" 
-			classname="bin/varnishtest/tests/e00021" 
+			classname="bin/varnishtest/tests.e00021" 
 		>
 		</testcase>
 		<testcase
 			name="e00022" 
-			classname="bin/varnishtest/tests/e00022" 
+			classname="bin/varnishtest/tests.e00022" 
 		>
 		</testcase>
 		<testcase
 			name="e00023" 
-			classname="bin/varnishtest/tests/e00023" 
+			classname="bin/varnishtest/tests.e00023" 
 		>
 		</testcase>
 		<testcase
 			name="e00024" 
-			classname="bin/varnishtest/tests/e00024" 
+			classname="bin/varnishtest/tests.e00024" 
 		>
 		</testcase>
 		<testcase
 			name="e00025" 
-			classname="bin/varnishtest/tests/e00025" 
+			classname="bin/varnishtest/tests.e00025" 
 		>
 		</testcase>
 		<testcase
 			name="e00026" 
-			classname="bin/varnishtest/tests/e00026" 
+			classname="bin/varnishtest/tests.e00026" 
 		>
 		</testcase>
 		<testcase
 			name="e00027" 
-			classname="bin/varnishtest/tests/e00027" 
+			classname="bin/varnishtest/tests.e00027" 
 		>
 		</testcase>
 		<testcase
 			name="e00028" 
-			classname="bin/varnishtest/tests/e00028" 
+			classname="bin/varnishtest/tests.e00028" 
 		>
 		</testcase>
 		<testcase
 			name="e00030" 
-			classname="bin/varnishtest/tests/e00030" 
+			classname="bin/varnishtest/tests.e00030" 
 		>
 		</testcase>
 		<testcase
 			name="e00031" 
-			classname="bin/varnishtest/tests/e00031" 
+			classname="bin/varnishtest/tests.e00031" 
 		>
 		</testcase>
 		<testcase
 			name="f00001" 
-			classname="bin/varnishtest/tests/f00001" 
+			classname="bin/varnishtest/tests.f00001" 
 		>
 		</testcase>
 		<testcase
 			name="f10003" 
-			classname="bin/varnishtest/tests/f10003" 
+			classname="bin/varnishtest/tests.f10003" 
 		>
 		</testcase>
 		<testcase
 			name="g00000" 
-			classname="bin/varnishtest/tests/g00000" 
+			classname="bin/varnishtest/tests.g00000" 
 		>
 		</testcase>
 		<testcase
 			name="g00001" 
-			classname="bin/varnishtest/tests/g00001" 
+			classname="bin/varnishtest/tests.g00001" 
 		>
 		</testcase>
 		<testcase
 			name="g00002" 
-			classname="bin/varnishtest/tests/g00002" 
+			classname="bin/varnishtest/tests.g00002" 
 		>
 		</testcase>
 		<testcase
 			name="g00003" 
-			classname="bin/varnishtest/tests/g00003" 
+			classname="bin/varnishtest/tests.g00003" 
 		>
 		</testcase>
 		<testcase
 			name="g00004" 
-			classname="bin/varnishtest/tests/g00004" 
+			classname="bin/varnishtest/tests.g00004" 
 		>
 		</testcase>
 		<testcase
 			name="g00005" 
-			classname="bin/varnishtest/tests/g00005" 
+			classname="bin/varnishtest/tests.g00005" 
 		>
 		</testcase>
 		<testcase
 			name="g00006" 
-			classname="bin/varnishtest/tests/g00006" 
+			classname="bin/varnishtest/tests.g00006" 
 		>
 		</testcase>
 		<testcase
 			name="g00007" 
-			classname="bin/varnishtest/tests/g00007" 
+			classname="bin/varnishtest/tests.g00007" 
 		>
 		</testcase>
 		<testcase
 			name="h00001" 
-			classname="bin/varnishtest/tests/h00001" 
+			classname="bin/varnishtest/tests.h00001" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="h00002" 
-			classname="bin/varnishtest/tests/h00002" 
+			classname="bin/varnishtest/tests.h00002" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="h00003" 
-			classname="bin/varnishtest/tests/h00003" 
+			classname="bin/varnishtest/tests.h00003" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="h00004" 
-			classname="bin/varnishtest/tests/h00004" 
+			classname="bin/varnishtest/tests.h00004" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="h00005" 
-			classname="bin/varnishtest/tests/h00005" 
+			classname="bin/varnishtest/tests.h00005" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="j00000" 
-			classname="bin/varnishtest/tests/j00000" 
+			classname="bin/varnishtest/tests.j00000" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="j00001" 
-			classname="bin/varnishtest/tests/j00001" 
+			classname="bin/varnishtest/tests.j00001" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="j00003" 
-			classname="bin/varnishtest/tests/j00003" 
+			classname="bin/varnishtest/tests.j00003" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="j00004" 
-			classname="bin/varnishtest/tests/j00004" 
+			classname="bin/varnishtest/tests.j00004" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="l00000" 
-			classname="bin/varnishtest/tests/l00000" 
+			classname="bin/varnishtest/tests.l00000" 
 		>
 		</testcase>
 		<testcase
 			name="l00001" 
-			classname="bin/varnishtest/tests/l00001" 
+			classname="bin/varnishtest/tests.l00001" 
 		>
 		</testcase>
 		<testcase
 			name="l00002" 
-			classname="bin/varnishtest/tests/l00002" 
+			classname="bin/varnishtest/tests.l00002" 
 		>
 		</testcase>
 		<testcase
 			name="l00003" 
-			classname="bin/varnishtest/tests/l00003" 
+			classname="bin/varnishtest/tests.l00003" 
 		>
 		</testcase>
 		<testcase
 			name="l00004" 
-			classname="bin/varnishtest/tests/l00004" 
+			classname="bin/varnishtest/tests.l00004" 
 		>
 		</testcase>
 		<testcase
 			name="l00005" 
-			classname="bin/varnishtest/tests/l00005" 
+			classname="bin/varnishtest/tests.l00005" 
 		>
 		</testcase>
 		<testcase
 			name="m00000" 
-			classname="bin/varnishtest/tests/m00000" 
+			classname="bin/varnishtest/tests.m00000" 
 		>
 		</testcase>
 		<testcase
 			name="m00001" 
-			classname="bin/varnishtest/tests/m00001" 
+			classname="bin/varnishtest/tests.m00001" 
 		>
 		</testcase>
 		<testcase
 			name="m00002" 
-			classname="bin/varnishtest/tests/m00002" 
+			classname="bin/varnishtest/tests.m00002" 
 		>
 		</testcase>
 		<testcase
 			name="m00003" 
-			classname="bin/varnishtest/tests/m00003" 
+			classname="bin/varnishtest/tests.m00003" 
 		>
 		</testcase>
 		<testcase
 			name="m00004" 
-			classname="bin/varnishtest/tests/m00004" 
+			classname="bin/varnishtest/tests.m00004" 
 		>
 		</testcase>
 		<testcase
 			name="m00005" 
-			classname="bin/varnishtest/tests/m00005" 
+			classname="bin/varnishtest/tests.m00005" 
 		>
 		</testcase>
 		<testcase
 			name="m00006" 
-			classname="bin/varnishtest/tests/m00006" 
+			classname="bin/varnishtest/tests.m00006" 
 		>
 		</testcase>
 		<testcase
 			name="m00007" 
-			classname="bin/varnishtest/tests/m00007" 
+			classname="bin/varnishtest/tests.m00007" 
 		>
 		</testcase>
 		<testcase
 			name="m00008" 
-			classname="bin/varnishtest/tests/m00008" 
+			classname="bin/varnishtest/tests.m00008" 
 		>
 		</testcase>
 		<testcase
 			name="m00011" 
-			classname="bin/varnishtest/tests/m00011" 
+			classname="bin/varnishtest/tests.m00011" 
 		>
 		</testcase>
 		<testcase
 			name="m00012" 
-			classname="bin/varnishtest/tests/m00012" 
+			classname="bin/varnishtest/tests.m00012" 
 		>
 		</testcase>
 		<testcase
 			name="m00013" 
-			classname="bin/varnishtest/tests/m00013" 
+			classname="bin/varnishtest/tests.m00013" 
 		>
 		</testcase>
 		<testcase
 			name="m00014" 
-			classname="bin/varnishtest/tests/m00014" 
+			classname="bin/varnishtest/tests.m00014" 
 		>
 		</testcase>
 		<testcase
 			name="m00015" 
-			classname="bin/varnishtest/tests/m00015" 
+			classname="bin/varnishtest/tests.m00015" 
 		>
 		</testcase>
 		<testcase
 			name="m00017" 
-			classname="bin/varnishtest/tests/m00017" 
+			classname="bin/varnishtest/tests.m00017" 
 		>
 		</testcase>
 		<testcase
 			name="m00018" 
-			classname="bin/varnishtest/tests/m00018" 
+			classname="bin/varnishtest/tests.m00018" 
 		>
 		</testcase>
 		<testcase
 			name="m00019" 
-			classname="bin/varnishtest/tests/m00019" 
+			classname="bin/varnishtest/tests.m00019" 
 		>
 		</testcase>
 		<testcase
 			name="m00020" 
-			classname="bin/varnishtest/tests/m00020" 
+			classname="bin/varnishtest/tests.m00020" 
 		>
 		</testcase>
 		<testcase
 			name="m00021" 
-			classname="bin/varnishtest/tests/m00021" 
+			classname="bin/varnishtest/tests.m00021" 
 		>
 		</testcase>
 		<testcase
 			name="m00022" 
-			classname="bin/varnishtest/tests/m00022" 
+			classname="bin/varnishtest/tests.m00022" 
 		>
 		</testcase>
 		<testcase
 			name="m00023" 
-			classname="bin/varnishtest/tests/m00023" 
+			classname="bin/varnishtest/tests.m00023" 
 		>
 		</testcase>
 		<testcase
 			name="m00024" 
-			classname="bin/varnishtest/tests/m00024" 
+			classname="bin/varnishtest/tests.m00024" 
 		>
 		</testcase>
 		<testcase
 			name="m00025" 
-			classname="bin/varnishtest/tests/m00025" 
+			classname="bin/varnishtest/tests.m00025" 
 		>
 		</testcase>
 		<testcase
 			name="m00026" 
-			classname="bin/varnishtest/tests/m00026" 
+			classname="bin/varnishtest/tests.m00026" 
 		>
 		</testcase>
 		<testcase
 			name="m00027" 
-			classname="bin/varnishtest/tests/m00027" 
+			classname="bin/varnishtest/tests.m00027" 
 		>
 		</testcase>
 		<testcase
 			name="m00028" 
-			classname="bin/varnishtest/tests/m00028" 
+			classname="bin/varnishtest/tests.m00028" 
 		>
 		</testcase>
 		<testcase
 			name="m00029" 
-			classname="bin/varnishtest/tests/m00029" 
+			classname="bin/varnishtest/tests.m00029" 
 		>
 		</testcase>
 		<testcase
 			name="m00030" 
-			classname="bin/varnishtest/tests/m00030" 
+			classname="bin/varnishtest/tests.m00030" 
 		>
 		</testcase>
 		<testcase
 			name="m00031" 
-			classname="bin/varnishtest/tests/m00031" 
+			classname="bin/varnishtest/tests.m00031" 
 		>
 		</testcase>
 		<testcase
 			name="m00032" 
-			classname="bin/varnishtest/tests/m00032" 
+			classname="bin/varnishtest/tests.m00032" 
 		>
 		</testcase>
 		<testcase
 			name="m00033" 
-			classname="bin/varnishtest/tests/m00033" 
+			classname="bin/varnishtest/tests.m00033" 
 		>
 		</testcase>
 		<testcase
 			name="m00034" 
-			classname="bin/varnishtest/tests/m00034" 
+			classname="bin/varnishtest/tests.m00034" 
 		>
 		</testcase>
 		<testcase
 			name="m00035" 
-			classname="bin/varnishtest/tests/m00035" 
+			classname="bin/varnishtest/tests.m00035" 
 		>
 		</testcase>
 		<testcase
 			name="m00036" 
-			classname="bin/varnishtest/tests/m00036" 
+			classname="bin/varnishtest/tests.m00036" 
 		>
 		</testcase>
 		<testcase
 			name="m00037" 
-			classname="bin/varnishtest/tests/m00037" 
+			classname="bin/varnishtest/tests.m00037" 
 		>
 		</testcase>
 		<testcase
 			name="m00038" 
-			classname="bin/varnishtest/tests/m00038" 
+			classname="bin/varnishtest/tests.m00038" 
 		>
 		</testcase>
 		<testcase
 			name="m00039" 
-			classname="bin/varnishtest/tests/m00039" 
+			classname="bin/varnishtest/tests.m00039" 
 		>
 		</testcase>
 		<testcase
 			name="m00040" 
-			classname="bin/varnishtest/tests/m00040" 
+			classname="bin/varnishtest/tests.m00040" 
 		>
 		</testcase>
 		<testcase
 			name="m00041" 
-			classname="bin/varnishtest/tests/m00041" 
+			classname="bin/varnishtest/tests.m00041" 
 		>
 		</testcase>
 		<testcase
 			name="m00042" 
-			classname="bin/varnishtest/tests/m00042" 
+			classname="bin/varnishtest/tests.m00042" 
 		>
 		</testcase>
 		<testcase
 			name="m00043" 
-			classname="bin/varnishtest/tests/m00043" 
+			classname="bin/varnishtest/tests.m00043" 
 		>
 		</testcase>
 		<testcase
 			name="m00044" 
-			classname="bin/varnishtest/tests/m00044" 
+			classname="bin/varnishtest/tests.m00044" 
 		>
 		</testcase>
 		<testcase
 			name="m00045" 
-			classname="bin/varnishtest/tests/m00045" 
+			classname="bin/varnishtest/tests.m00045" 
 		>
 		</testcase>
 		<testcase
 			name="m00046" 
-			classname="bin/varnishtest/tests/m00046" 
+			classname="bin/varnishtest/tests.m00046" 
 		>
 		</testcase>
 		<testcase
 			name="m00047" 
-			classname="bin/varnishtest/tests/m00047" 
+			classname="bin/varnishtest/tests.m00047" 
 		>
 		</testcase>
 		<testcase
 			name="m00049" 
-			classname="bin/varnishtest/tests/m00049" 
+			classname="bin/varnishtest/tests.m00049" 
 		>
 		</testcase>
 		<testcase
 			name="m00050" 
-			classname="bin/varnishtest/tests/m00050" 
+			classname="bin/varnishtest/tests.m00050" 
 		>
 		</testcase>
 		<testcase
 			name="m01000" 
-			classname="bin/varnishtest/tests/m01000" 
+			classname="bin/varnishtest/tests.m01000" 
 		>
 		</testcase>
 		<testcase
 			name="o00000" 
-			classname="bin/varnishtest/tests/o00000" 
+			classname="bin/varnishtest/tests.o00000" 
 		>
 		</testcase>
 		<testcase
 			name="o00001" 
-			classname="bin/varnishtest/tests/o00001" 
+			classname="bin/varnishtest/tests.o00001" 
 		>
 		</testcase>
 		<testcase
 			name="o00002" 
-			classname="bin/varnishtest/tests/o00002" 
+			classname="bin/varnishtest/tests.o00002" 
 		>
 		</testcase>
 		<testcase
 			name="o00003" 
-			classname="bin/varnishtest/tests/o00003" 
+			classname="bin/varnishtest/tests.o00003" 
 		>
 		</testcase>
 		<testcase
 			name="o00004" 
-			classname="bin/varnishtest/tests/o00004" 
+			classname="bin/varnishtest/tests.o00004" 
 		>
 		</testcase>
 		<testcase
 			name="o00005" 
-			classname="bin/varnishtest/tests/o00005" 
+			classname="bin/varnishtest/tests.o00005" 
 		>
 		</testcase>
 		<testcase
 			name="p00000" 
-			classname="bin/varnishtest/tests/p00000" 
+			classname="bin/varnishtest/tests.p00000" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00002" 
-			classname="bin/varnishtest/tests/p00002" 
+			classname="bin/varnishtest/tests.p00002" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00003" 
-			classname="bin/varnishtest/tests/p00003" 
+			classname="bin/varnishtest/tests.p00003" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00004" 
-			classname="bin/varnishtest/tests/p00004" 
+			classname="bin/varnishtest/tests.p00004" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00005" 
-			classname="bin/varnishtest/tests/p00005" 
+			classname="bin/varnishtest/tests.p00005" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00006" 
-			classname="bin/varnishtest/tests/p00006" 
+			classname="bin/varnishtest/tests.p00006" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00007" 
-			classname="bin/varnishtest/tests/p00007" 
+			classname="bin/varnishtest/tests.p00007" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00008" 
-			classname="bin/varnishtest/tests/p00008" 
+			classname="bin/varnishtest/tests.p00008" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="p00009" 
-			classname="bin/varnishtest/tests/p00009" 
+			classname="bin/varnishtest/tests.p00009" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="r00102" 
-			classname="bin/varnishtest/tests/r00102" 
+			classname="bin/varnishtest/tests.r00102" 
 		>
 		</testcase>
 		<testcase
 			name="r00251" 
-			classname="bin/varnishtest/tests/r00251" 
+			classname="bin/varnishtest/tests.r00251" 
 		>
 		</testcase>
 		<testcase
 			name="r00255" 
-			classname="bin/varnishtest/tests/r00255" 
+			classname="bin/varnishtest/tests.r00255" 
 		>
 		</testcase>
 		<testcase
 			name="r00262" 
-			classname="bin/varnishtest/tests/r00262" 
+			classname="bin/varnishtest/tests.r00262" 
 		>
 		</testcase>
 		<testcase
 			name="r00263" 
-			classname="bin/varnishtest/tests/r00263" 
+			classname="bin/varnishtest/tests.r00263" 
 		>
 		</testcase>
 		<testcase
 			name="r00292" 
-			classname="bin/varnishtest/tests/r00292" 
+			classname="bin/varnishtest/tests.r00292" 
 		>
 		</testcase>
 		<testcase
 			name="r00306" 
-			classname="bin/varnishtest/tests/r00306" 
+			classname="bin/varnishtest/tests.r00306" 
 		>
 		</testcase>
 		<testcase
 			name="r00310" 
-			classname="bin/varnishtest/tests/r00310" 
+			classname="bin/varnishtest/tests.r00310" 
 		>
 		</testcase>
 		<testcase
 			name="r00318" 
-			classname="bin/varnishtest/tests/r00318" 
+			classname="bin/varnishtest/tests.r00318" 
 		>
 		</testcase>
 		<testcase
 			name="r00325" 
-			classname="bin/varnishtest/tests/r00325" 
+			classname="bin/varnishtest/tests.r00325" 
 		>
 		</testcase>
 		<testcase
 			name="r00326" 
-			classname="bin/varnishtest/tests/r00326" 
+			classname="bin/varnishtest/tests.r00326" 
 		>
 		</testcase>
 		<testcase
 			name="r00345" 
-			classname="bin/varnishtest/tests/r00345" 
+			classname="bin/varnishtest/tests.r00345" 
 		>
 		</testcase>
 		<testcase
 			name="r00386" 
-			classname="bin/varnishtest/tests/r00386" 
+			classname="bin/varnishtest/tests.r00386" 
 		>
 		</testcase>
 		<testcase
 			name="r00387" 
-			classname="bin/varnishtest/tests/r00387" 
+			classname="bin/varnishtest/tests.r00387" 
 		>
 		</testcase>
 		<testcase
 			name="r00400" 
-			classname="bin/varnishtest/tests/r00400" 
+			classname="bin/varnishtest/tests.r00400" 
 		>
 		</testcase>
 		<testcase
 			name="r00409" 
-			classname="bin/varnishtest/tests/r00409" 
+			classname="bin/varnishtest/tests.r00409" 
 		>
 		</testcase>
 		<testcase
 			name="r00411" 
-			classname="bin/varnishtest/tests/r00411" 
+			classname="bin/varnishtest/tests.r00411" 
 		>
 		</testcase>
 		<testcase
 			name="r00412" 
-			classname="bin/varnishtest/tests/r00412" 
+			classname="bin/varnishtest/tests.r00412" 
 		>
 		</testcase>
 		<testcase
 			name="r00416" 
-			classname="bin/varnishtest/tests/r00416" 
+			classname="bin/varnishtest/tests.r00416" 
 		>
 		</testcase>
 		<testcase
 			name="r00425" 
-			classname="bin/varnishtest/tests/r00425" 
+			classname="bin/varnishtest/tests.r00425" 
 		>
 		</testcase>
 		<testcase
 			name="r00427" 
-			classname="bin/varnishtest/tests/r00427" 
+			classname="bin/varnishtest/tests.r00427" 
 		>
 		</testcase>
 		<testcase
 			name="r00433" 
-			classname="bin/varnishtest/tests/r00433" 
+			classname="bin/varnishtest/tests.r00433" 
 		>
 		</testcase>
 		<testcase
 			name="r00445" 
-			classname="bin/varnishtest/tests/r00445" 
+			classname="bin/varnishtest/tests.r00445" 
 		>
 		</testcase>
 		<testcase
 			name="r00466" 
-			classname="bin/varnishtest/tests/r00466" 
+			classname="bin/varnishtest/tests.r00466" 
 		>
 		</testcase>
 		<testcase
 			name="r00476" 
-			classname="bin/varnishtest/tests/r00476" 
+			classname="bin/varnishtest/tests.r00476" 
 		>
 		</testcase>
 		<testcase
 			name="r00494" 
-			classname="bin/varnishtest/tests/r00494" 
+			classname="bin/varnishtest/tests.r00494" 
 		>
 		</testcase>
 		<testcase
 			name="r00495" 
-			classname="bin/varnishtest/tests/r00495" 
+			classname="bin/varnishtest/tests.r00495" 
 		>
 		</testcase>
 		<testcase
 			name="r00498" 
-			classname="bin/varnishtest/tests/r00498" 
+			classname="bin/varnishtest/tests.r00498" 
 		>
 		</testcase>
 		<testcase
 			name="r00502" 
-			classname="bin/varnishtest/tests/r00502" 
+			classname="bin/varnishtest/tests.r00502" 
 		>
 		</testcase>
 		<testcase
 			name="r00506" 
-			classname="bin/varnishtest/tests/r00506" 
+			classname="bin/varnishtest/tests.r00506" 
 		>
 		</testcase>
 		<testcase
 			name="r00524" 
-			classname="bin/varnishtest/tests/r00524" 
+			classname="bin/varnishtest/tests.r00524" 
 		>
 		</testcase>
 		<testcase
 			name="r00545" 
-			classname="bin/varnishtest/tests/r00545" 
+			classname="bin/varnishtest/tests.r00545" 
 		>
 		</testcase>
 		<testcase
 			name="r00549" 
-			classname="bin/varnishtest/tests/r00549" 
+			classname="bin/varnishtest/tests.r00549" 
 		>
 		</testcase>
 		<testcase
 			name="r00558" 
-			classname="bin/varnishtest/tests/r00558" 
+			classname="bin/varnishtest/tests.r00558" 
 		>
 		</testcase>
 		<testcase
 			name="r00561" 
-			classname="bin/varnishtest/tests/r00561" 
+			classname="bin/varnishtest/tests.r00561" 
 		>
 		</testcase>
 		<testcase
 			name="r00590" 
-			classname="bin/varnishtest/tests/r00590" 
+			classname="bin/varnishtest/tests.r00590" 
 		>
 		</testcase>
 		<testcase
 			name="r00612" 
-			classname="bin/varnishtest/tests/r00612" 
+			classname="bin/varnishtest/tests.r00612" 
 		>
 		</testcase>
 		<testcase
 			name="r00641" 
-			classname="bin/varnishtest/tests/r00641" 
+			classname="bin/varnishtest/tests.r00641" 
 		>
 		</testcase>
 		<testcase
 			name="r00655" 
-			classname="bin/varnishtest/tests/r00655" 
+			classname="bin/varnishtest/tests.r00655" 
 		>
 		</testcase>
 		<testcase
 			name="r00667" 
-			classname="bin/varnishtest/tests/r00667" 
+			classname="bin/varnishtest/tests.r00667" 
 		>
 		</testcase>
 		<testcase
 			name="r00679" 
-			classname="bin/varnishtest/tests/r00679" 
+			classname="bin/varnishtest/tests.r00679" 
 		>
 		</testcase>
 		<testcase
 			name="r00686" 
-			classname="bin/varnishtest/tests/r00686" 
+			classname="bin/varnishtest/tests.r00686" 
 		>
 		</testcase>
 		<testcase
 			name="r00694" 
-			classname="bin/varnishtest/tests/r00694" 
+			classname="bin/varnishtest/tests.r00694" 
 		>
 		</testcase>
 		<testcase
 			name="r00700" 
-			classname="bin/varnishtest/tests/r00700" 
+			classname="bin/varnishtest/tests.r00700" 
 		>
 		</testcase>
 		<testcase
 			name="r00702" 
-			classname="bin/varnishtest/tests/r00702" 
+			classname="bin/varnishtest/tests.r00702" 
 		>
 		</testcase>
 		<testcase
 			name="r00704" 
-			classname="bin/varnishtest/tests/r00704" 
+			classname="bin/varnishtest/tests.r00704" 
 		>
 		</testcase>
 		<testcase
 			name="r00722" 
-			classname="bin/varnishtest/tests/r00722" 
+			classname="bin/varnishtest/tests.r00722" 
 		>
 		</testcase>
 		<testcase
 			name="r00730" 
-			classname="bin/varnishtest/tests/r00730" 
+			classname="bin/varnishtest/tests.r00730" 
 		>
 		</testcase>
 		<testcase
 			name="r00733" 
-			classname="bin/varnishtest/tests/r00733" 
+			classname="bin/varnishtest/tests.r00733" 
 		>
 		</testcase>
 		<testcase
 			name="r00742" 
-			classname="bin/varnishtest/tests/r00742" 
+			classname="bin/varnishtest/tests.r00742" 
 		>
 		</testcase>
 		<testcase
 			name="r00763" 
-			classname="bin/varnishtest/tests/r00763" 
+			classname="bin/varnishtest/tests.r00763" 
 		>
 		</testcase>
 		<testcase
 			name="r00769" 
-			classname="bin/varnishtest/tests/r00769" 
+			classname="bin/varnishtest/tests.r00769" 
 		>
 		</testcase>
 		<testcase
 			name="r00776" 
-			classname="bin/varnishtest/tests/r00776" 
+			classname="bin/varnishtest/tests.r00776" 
 		>
 		</testcase>
 		<testcase
 			name="r00781" 
-			classname="bin/varnishtest/tests/r00781" 
+			classname="bin/varnishtest/tests.r00781" 
 		>
 		</testcase>
 		<testcase
 			name="r00789" 
-			classname="bin/varnishtest/tests/r00789" 
+			classname="bin/varnishtest/tests.r00789" 
 		>
 		</testcase>
 		<testcase
 			name="r00795" 
-			classname="bin/varnishtest/tests/r00795" 
+			classname="bin/varnishtest/tests.r00795" 
 		>
 		</testcase>
 		<testcase
 			name="r00801" 
-			classname="bin/varnishtest/tests/r00801" 
+			classname="bin/varnishtest/tests.r00801" 
 		>
 		</testcase>
 		<testcase
 			name="r00803" 
-			classname="bin/varnishtest/tests/r00803" 
+			classname="bin/varnishtest/tests.r00803" 
 		>
 		</testcase>
 		<testcase
 			name="r00806" 
-			classname="bin/varnishtest/tests/r00806" 
+			classname="bin/varnishtest/tests.r00806" 
 		>
 		</testcase>
 		<testcase
 			name="r00832" 
-			classname="bin/varnishtest/tests/r00832" 
+			classname="bin/varnishtest/tests.r00832" 
 		>
 		</testcase>
 		<testcase
 			name="r00861" 
-			classname="bin/varnishtest/tests/r00861" 
+			classname="bin/varnishtest/tests.r00861" 
 		>
 		</testcase>
 		<testcase
 			name="r00873" 
-			classname="bin/varnishtest/tests/r00873" 
+			classname="bin/varnishtest/tests.r00873" 
 		>
 		</testcase>
 		<testcase
 			name="r00878" 
-			classname="bin/varnishtest/tests/r00878" 
+			classname="bin/varnishtest/tests.r00878" 
 		>
 		</testcase>
 		<testcase
 			name="r00887" 
-			classname="bin/varnishtest/tests/r00887" 
+			classname="bin/varnishtest/tests.r00887" 
 		>
 		</testcase>
 		<testcase
 			name="r00894" 
-			classname="bin/varnishtest/tests/r00894" 
+			classname="bin/varnishtest/tests.r00894" 
 		>
 		</testcase>
 		<testcase
 			name="r00896" 
-			classname="bin/varnishtest/tests/r00896" 
+			classname="bin/varnishtest/tests.r00896" 
 		>
 		</testcase>
 		<testcase
 			name="r00902" 
-			classname="bin/varnishtest/tests/r00902" 
+			classname="bin/varnishtest/tests.r00902" 
 		>
 		</testcase>
 		<testcase
 			name="r00911" 
-			classname="bin/varnishtest/tests/r00911" 
+			classname="bin/varnishtest/tests.r00911" 
 		>
 		</testcase>
 		<testcase
 			name="r00913" 
-			classname="bin/varnishtest/tests/r00913" 
+			classname="bin/varnishtest/tests.r00913" 
 		>
 		</testcase>
 		<testcase
 			name="r00915" 
-			classname="bin/varnishtest/tests/r00915" 
+			classname="bin/varnishtest/tests.r00915" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="r00916" 
-			classname="bin/varnishtest/tests/r00916" 
+			classname="bin/varnishtest/tests.r00916" 
 		>
 		</testcase>
 		<testcase
 			name="r00917" 
-			classname="bin/varnishtest/tests/r00917" 
+			classname="bin/varnishtest/tests.r00917" 
 		>
 		</testcase>
 		<testcase
 			name="r00921" 
-			classname="bin/varnishtest/tests/r00921" 
+			classname="bin/varnishtest/tests.r00921" 
 		>
 		</testcase>
 		<testcase
 			name="r00940" 
-			classname="bin/varnishtest/tests/r00940" 
+			classname="bin/varnishtest/tests.r00940" 
 		>
 		</testcase>
 		<testcase
 			name="r00941" 
-			classname="bin/varnishtest/tests/r00941" 
+			classname="bin/varnishtest/tests.r00941" 
 		>
 		</testcase>
 		<testcase
 			name="r00942" 
-			classname="bin/varnishtest/tests/r00942" 
+			classname="bin/varnishtest/tests.r00942" 
 		>
 		</testcase>
 		<testcase
 			name="r00948" 
-			classname="bin/varnishtest/tests/r00948" 
+			classname="bin/varnishtest/tests.r00948" 
 		>
 		</testcase>
 		<testcase
 			name="r00956" 
-			classname="bin/varnishtest/tests/r00956" 
+			classname="bin/varnishtest/tests.r00956" 
 		>
 		</testcase>
 		<testcase
 			name="r00961" 
-			classname="bin/varnishtest/tests/r00961" 
+			classname="bin/varnishtest/tests.r00961" 
 		>
 		</testcase>
 		<testcase
 			name="r00962" 
-			classname="bin/varnishtest/tests/r00962" 
+			classname="bin/varnishtest/tests.r00962" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="r00963" 
-			classname="bin/varnishtest/tests/r00963" 
+			classname="bin/varnishtest/tests.r00963" 
 		>
 		</testcase>
 		<testcase
 			name="r00965" 
-			classname="bin/varnishtest/tests/r00965" 
+			classname="bin/varnishtest/tests.r00965" 
 		>
 		</testcase>
 		<testcase
 			name="r00972" 
-			classname="bin/varnishtest/tests/r00972" 
+			classname="bin/varnishtest/tests.r00972" 
 		>
 		</testcase>
 		<testcase
 			name="r00979" 
-			classname="bin/varnishtest/tests/r00979" 
+			classname="bin/varnishtest/tests.r00979" 
 		>
 		</testcase>
 		<testcase
 			name="r00980" 
-			classname="bin/varnishtest/tests/r00980" 
+			classname="bin/varnishtest/tests.r00980" 
 		>
 		</testcase>
 		<testcase
 			name="r00984" 
-			classname="bin/varnishtest/tests/r00984" 
+			classname="bin/varnishtest/tests.r00984" 
 		>
 		</testcase>
 		<testcase
 			name="r01002" 
-			classname="bin/varnishtest/tests/r01002" 
+			classname="bin/varnishtest/tests.r01002" 
 		>
 		</testcase>
 		<testcase
 			name="r01014" 
-			classname="bin/varnishtest/tests/r01014" 
+			classname="bin/varnishtest/tests.r01014" 
 		>
 		</testcase>
 		<testcase
 			name="r01029" 
-			classname="bin/varnishtest/tests/r01029" 
+			classname="bin/varnishtest/tests.r01029" 
 		>
 		</testcase>
 		<testcase
 			name="r01030" 
-			classname="bin/varnishtest/tests/r01030" 
+			classname="bin/varnishtest/tests.r01030" 
 		>
 		</testcase>
 		<testcase
 			name="r01036" 
-			classname="bin/varnishtest/tests/r01036" 
+			classname="bin/varnishtest/tests.r01036" 
 		>
 		</testcase>
 		<testcase
 			name="r01037" 
-			classname="bin/varnishtest/tests/r01037" 
+			classname="bin/varnishtest/tests.r01037" 
 		>
 		</testcase>
 		<testcase
 			name="r01038" 
-			classname="bin/varnishtest/tests/r01038" 
+			classname="bin/varnishtest/tests.r01038" 
 		>
 		</testcase>
 		<testcase
 			name="r01068" 
-			classname="bin/varnishtest/tests/r01068" 
+			classname="bin/varnishtest/tests.r01068" 
 		>
 		</testcase>
 		<testcase
 			name="r01073" 
-			classname="bin/varnishtest/tests/r01073" 
+			classname="bin/varnishtest/tests.r01073" 
 		>
 		</testcase>
 		<testcase
 			name="r01086" 
-			classname="bin/varnishtest/tests/r01086" 
+			classname="bin/varnishtest/tests.r01086" 
 		>
 		</testcase>
 		<testcase
 			name="r01092" 
-			classname="bin/varnishtest/tests/r01092" 
+			classname="bin/varnishtest/tests.r01092" 
 		>
 		</testcase>
 		<testcase
 			name="r01109" 
-			classname="bin/varnishtest/tests/r01109" 
+			classname="bin/varnishtest/tests.r01109" 
 		>
 		</testcase>
 		<testcase
 			name="r01113" 
-			classname="bin/varnishtest/tests/r01113" 
+			classname="bin/varnishtest/tests.r01113" 
 		>
 		</testcase>
 		<testcase
 			name="r01120" 
-			classname="bin/varnishtest/tests/r01120" 
+			classname="bin/varnishtest/tests.r01120" 
 		>
 		</testcase>
 		<testcase
 			name="r01123" 
-			classname="bin/varnishtest/tests/r01123" 
+			classname="bin/varnishtest/tests.r01123" 
 		>
 		</testcase>
 		<testcase
 			name="r01134" 
-			classname="bin/varnishtest/tests/r01134" 
+			classname="bin/varnishtest/tests.r01134" 
 		>
 		</testcase>
 		<testcase
 			name="r01140" 
-			classname="bin/varnishtest/tests/r01140" 
+			classname="bin/varnishtest/tests.r01140" 
 		>
 		</testcase>
 		<testcase
 			name="r01144" 
-			classname="bin/varnishtest/tests/r01144" 
+			classname="bin/varnishtest/tests.r01144" 
 		>
 		</testcase>
 		<testcase
 			name="r01145" 
-			classname="bin/varnishtest/tests/r01145" 
+			classname="bin/varnishtest/tests.r01145" 
 		>
 		</testcase>
 		<testcase
 			name="r01156" 
-			classname="bin/varnishtest/tests/r01156" 
+			classname="bin/varnishtest/tests.r01156" 
 		>
 		</testcase>
 		<testcase
 			name="r01157" 
-			classname="bin/varnishtest/tests/r01157" 
+			classname="bin/varnishtest/tests.r01157" 
 		>
 		</testcase>
 		<testcase
 			name="r01164" 
-			classname="bin/varnishtest/tests/r01164" 
+			classname="bin/varnishtest/tests.r01164" 
 		>
 		</testcase>
 		<testcase
 			name="r01168" 
-			classname="bin/varnishtest/tests/r01168" 
+			classname="bin/varnishtest/tests.r01168" 
 		>
 		</testcase>
 		<testcase
 			name="r01169" 
-			classname="bin/varnishtest/tests/r01169" 
+			classname="bin/varnishtest/tests.r01169" 
 		>
 		</testcase>
 		<testcase
 			name="r01175" 
-			classname="bin/varnishtest/tests/r01175" 
+			classname="bin/varnishtest/tests.r01175" 
 		>
 		</testcase>
 		<testcase
 			name="r01176" 
-			classname="bin/varnishtest/tests/r01176" 
+			classname="bin/varnishtest/tests.r01176" 
 		>
 		</testcase>
 		<testcase
 			name="r01184" 
-			classname="bin/varnishtest/tests/r01184" 
+			classname="bin/varnishtest/tests.r01184" 
 		>
 		</testcase>
 		<testcase
 			name="r01211" 
-			classname="bin/varnishtest/tests/r01211" 
+			classname="bin/varnishtest/tests.r01211" 
 		>
 		</testcase>
 		<testcase
 			name="r01212" 
-			classname="bin/varnishtest/tests/r01212" 
+			classname="bin/varnishtest/tests.r01212" 
 		>
 		</testcase>
 		<testcase
 			name="r01218" 
-			classname="bin/varnishtest/tests/r01218" 
+			classname="bin/varnishtest/tests.r01218" 
 		>
 		</testcase>
 		<testcase
 			name="r01225" 
-			classname="bin/varnishtest/tests/r01225" 
+			classname="bin/varnishtest/tests.r01225" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="r01255" 
-			classname="bin/varnishtest/tests/r01255" 
+			classname="bin/varnishtest/tests.r01255" 
 		>
 		</testcase>
 		<testcase
 			name="r01266" 
-			classname="bin/varnishtest/tests/r01266" 
+			classname="bin/varnishtest/tests.r01266" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="r01274" 
-			classname="bin/varnishtest/tests/r01274" 
+			classname="bin/varnishtest/tests.r01274" 
 		>
 		</testcase>
 		<testcase
 			name="r01275" 
-			classname="bin/varnishtest/tests/r01275" 
+			classname="bin/varnishtest/tests.r01275" 
 		>
 		</testcase>
 		<testcase
 			name="r01284" 
-			classname="bin/varnishtest/tests/r01284" 
+			classname="bin/varnishtest/tests.r01284" 
 		>
 		</testcase>
 		<testcase
 			name="r01287" 
-			classname="bin/varnishtest/tests/r01287" 
+			classname="bin/varnishtest/tests.r01287" 
 		>
 		</testcase>
 		<testcase
 			name="r01296" 
-			classname="bin/varnishtest/tests/r01296" 
+			classname="bin/varnishtest/tests.r01296" 
 		>
 		</testcase>
 		<testcase
 			name="r01312" 
-			classname="bin/varnishtest/tests/r01312" 
+			classname="bin/varnishtest/tests.r01312" 
 		>
 		</testcase>
 		<testcase
 			name="r01320" 
-			classname="bin/varnishtest/tests/r01320" 
+			classname="bin/varnishtest/tests.r01320" 
 		>
 		</testcase>
 		<testcase
 			name="r01332" 
-			classname="bin/varnishtest/tests/r01332" 
+			classname="bin/varnishtest/tests.r01332" 
 		>
 		</testcase>
 		<testcase
 			name="r01333" 
-			classname="bin/varnishtest/tests/r01333" 
+			classname="bin/varnishtest/tests.r01333" 
 		>
 		</testcase>
 		<testcase
 			name="r01335" 
-			classname="bin/varnishtest/tests/r01335" 
+			classname="bin/varnishtest/tests.r01335" 
 		>
 		</testcase>
 		<testcase
 			name="r01337" 
-			classname="bin/varnishtest/tests/r01337" 
+			classname="bin/varnishtest/tests.r01337" 
 		>
 		</testcase>
 		<testcase
 			name="r01349" 
-			classname="bin/varnishtest/tests/r01349" 
+			classname="bin/varnishtest/tests.r01349" 
 		>
 		</testcase>
 		<testcase
 			name="r01350" 
-			classname="bin/varnishtest/tests/r01350" 
+			classname="bin/varnishtest/tests.r01350" 
 		>
 		</testcase>
 		<testcase
 			name="r01355" 
-			classname="bin/varnishtest/tests/r01355" 
+			classname="bin/varnishtest/tests.r01355" 
 		>
 		</testcase>
 		<testcase
 			name="r01356" 
-			classname="bin/varnishtest/tests/r01356" 
+			classname="bin/varnishtest/tests.r01356" 
 		>
 		</testcase>
 		<testcase
 			name="r01367" 
-			classname="bin/varnishtest/tests/r01367" 
+			classname="bin/varnishtest/tests.r01367" 
 		>
 		</testcase>
 		<testcase
 			name="r01391" 
-			classname="bin/varnishtest/tests/r01391" 
+			classname="bin/varnishtest/tests.r01391" 
 		>
 		</testcase>
 		<testcase
 			name="r01395" 
-			classname="bin/varnishtest/tests/r01395" 
+			classname="bin/varnishtest/tests.r01395" 
 		>
 		</testcase>
 		<testcase
 			name="r01398" 
-			classname="bin/varnishtest/tests/r01398" 
+			classname="bin/varnishtest/tests.r01398" 
 		>
 		</testcase>
 		<testcase
 			name="r01399" 
-			classname="bin/varnishtest/tests/r01399" 
+			classname="bin/varnishtest/tests.r01399" 
 		>
 		</testcase>
 		<testcase
 			name="r01401" 
-			classname="bin/varnishtest/tests/r01401" 
+			classname="bin/varnishtest/tests.r01401" 
 		>
 		</testcase>
 		<testcase
 			name="r01404" 
-			classname="bin/varnishtest/tests/r01404" 
+			classname="bin/varnishtest/tests.r01404" 
 		>
 		</testcase>
 		<testcase
 			name="r01406" 
-			classname="bin/varnishtest/tests/r01406" 
+			classname="bin/varnishtest/tests.r01406" 
 		>
 		</testcase>
 		<testcase
 			name="r01417" 
-			classname="bin/varnishtest/tests/r01417" 
+			classname="bin/varnishtest/tests.r01417" 
 		>
 		</testcase>
 		<testcase
 			name="r01419" 
-			classname="bin/varnishtest/tests/r01419" 
+			classname="bin/varnishtest/tests.r01419" 
 		>
 		</testcase>
 		<testcase
 			name="r01441" 
-			classname="bin/varnishtest/tests/r01441" 
+			classname="bin/varnishtest/tests.r01441" 
 		>
 		</testcase>
 		<testcase
 			name="r01442" 
-			classname="bin/varnishtest/tests/r01442" 
+			classname="bin/varnishtest/tests.r01442" 
 		>
 		</testcase>
 		<testcase
 			name="r01468" 
-			classname="bin/varnishtest/tests/r01468" 
+			classname="bin/varnishtest/tests.r01468" 
 		>
 		</testcase>
 		<testcase
 			name="r01478" 
-			classname="bin/varnishtest/tests/r01478" 
+			classname="bin/varnishtest/tests.r01478" 
 		>
 		</testcase>
 		<testcase
 			name="r01485" 
-			classname="bin/varnishtest/tests/r01485" 
+			classname="bin/varnishtest/tests.r01485" 
 		>
 		</testcase>
 		<testcase
 			name="r01493" 
-			classname="bin/varnishtest/tests/r01493" 
+			classname="bin/varnishtest/tests.r01493" 
 		>
 		</testcase>
 		<testcase
 			name="r01494" 
-			classname="bin/varnishtest/tests/r01494" 
+			classname="bin/varnishtest/tests.r01494" 
 		>
 		</testcase>
 		<testcase
 			name="r01498" 
-			classname="bin/varnishtest/tests/r01498" 
+			classname="bin/varnishtest/tests.r01498" 
 		>
 		</testcase>
 		<testcase
 			name="r01499" 
-			classname="bin/varnishtest/tests/r01499" 
+			classname="bin/varnishtest/tests.r01499" 
 		>
 		</testcase>
 		<testcase
 			name="r01501" 
-			classname="bin/varnishtest/tests/r01501" 
+			classname="bin/varnishtest/tests.r01501" 
 		>
 		</testcase>
 		<testcase
 			name="r01504" 
-			classname="bin/varnishtest/tests/r01504" 
+			classname="bin/varnishtest/tests.r01504" 
 		>
 		</testcase>
 		<testcase
 			name="r01510" 
-			classname="bin/varnishtest/tests/r01510" 
+			classname="bin/varnishtest/tests.r01510" 
 		>
 		</testcase>
 		<testcase
 			name="r01512" 
-			classname="bin/varnishtest/tests/r01512" 
+			classname="bin/varnishtest/tests.r01512" 
 		>
 		</testcase>
 		<testcase
 			name="r01518" 
-			classname="bin/varnishtest/tests/r01518" 
+			classname="bin/varnishtest/tests.r01518" 
 		>
 		</testcase>
 		<testcase
 			name="r01524" 
-			classname="bin/varnishtest/tests/r01524" 
+			classname="bin/varnishtest/tests.r01524" 
 		>
 		</testcase>
 		<testcase
 			name="r01532" 
-			classname="bin/varnishtest/tests/r01532" 
+			classname="bin/varnishtest/tests.r01532" 
 		>
 		</testcase>
 		<testcase
 			name="r01557" 
-			classname="bin/varnishtest/tests/r01557" 
+			classname="bin/varnishtest/tests.r01557" 
 		>
 		</testcase>
 		<testcase
 			name="r01562" 
-			classname="bin/varnishtest/tests/r01562" 
+			classname="bin/varnishtest/tests.r01562" 
 		>
 		</testcase>
 		<testcase
 			name="r01566" 
-			classname="bin/varnishtest/tests/r01566" 
+			classname="bin/varnishtest/tests.r01566" 
 		>
 		</testcase>
 		<testcase
 			name="r01569" 
-			classname="bin/varnishtest/tests/r01569" 
+			classname="bin/varnishtest/tests.r01569" 
 		>
 		</testcase>
 		<testcase
 			name="r01575" 
-			classname="bin/varnishtest/tests/r01575" 
+			classname="bin/varnishtest/tests.r01575" 
 		>
 		</testcase>
 		<testcase
 			name="r01577" 
-			classname="bin/varnishtest/tests/r01577" 
+			classname="bin/varnishtest/tests.r01577" 
 		>
 		</testcase>
 		<testcase
 			name="r01578" 
-			classname="bin/varnishtest/tests/r01578" 
+			classname="bin/varnishtest/tests.r01578" 
 		>
 		</testcase>
 		<testcase
 			name="r01581" 
-			classname="bin/varnishtest/tests/r01581" 
+			classname="bin/varnishtest/tests.r01581" 
 		>
 		</testcase>
 		<testcase
 			name="r01598" 
-			classname="bin/varnishtest/tests/r01598" 
+			classname="bin/varnishtest/tests.r01598" 
 		>
 		</testcase>
 		<testcase
 			name="r01602" 
-			classname="bin/varnishtest/tests/r01602" 
+			classname="bin/varnishtest/tests.r01602" 
 		>
 		</testcase>
 		<testcase
 			name="r01608" 
-			classname="bin/varnishtest/tests/r01608" 
+			classname="bin/varnishtest/tests.r01608" 
 		>
 		</testcase>
 		<testcase
 			name="r01612" 
-			classname="bin/varnishtest/tests/r01612" 
+			classname="bin/varnishtest/tests.r01612" 
 		>
 		</testcase>
 		<testcase
 			name="r01613" 
-			classname="bin/varnishtest/tests/r01613" 
+			classname="bin/varnishtest/tests.r01613" 
 		>
 		</testcase>
 		<testcase
 			name="r01624" 
-			classname="bin/varnishtest/tests/r01624" 
+			classname="bin/varnishtest/tests.r01624" 
 		>
 		</testcase>
 		<testcase
 			name="r01627" 
-			classname="bin/varnishtest/tests/r01627" 
+			classname="bin/varnishtest/tests.r01627" 
 		>
 		</testcase>
 		<testcase
 			name="r01637" 
-			classname="bin/varnishtest/tests/r01637" 
+			classname="bin/varnishtest/tests.r01637" 
 		>
 		</testcase>
 		<testcase
 			name="r01638" 
-			classname="bin/varnishtest/tests/r01638" 
+			classname="bin/varnishtest/tests.r01638" 
 		>
 		</testcase>
 		<testcase
 			name="r01641" 
-			classname="bin/varnishtest/tests/r01641" 
+			classname="bin/varnishtest/tests.r01641" 
 		>
 		</testcase>
 		<testcase
 			name="r01644" 
-			classname="bin/varnishtest/tests/r01644" 
+			classname="bin/varnishtest/tests.r01644" 
 		>
 		</testcase>
 		<testcase
 			name="r01646" 
-			classname="bin/varnishtest/tests/r01646" 
+			classname="bin/varnishtest/tests.r01646" 
 		>
 		</testcase>
 		<testcase
 			name="r01648" 
-			classname="bin/varnishtest/tests/r01648" 
+			classname="bin/varnishtest/tests.r01648" 
 		>
 		</testcase>
 		<testcase
 			name="r01650" 
-			classname="bin/varnishtest/tests/r01650" 
+			classname="bin/varnishtest/tests.r01650" 
 		>
 		</testcase>
 		<testcase
 			name="r01660" 
-			classname="bin/varnishtest/tests/r01660" 
+			classname="bin/varnishtest/tests.r01660" 
 		>
 		</testcase>
 		<testcase
 			name="r01662" 
-			classname="bin/varnishtest/tests/r01662" 
+			classname="bin/varnishtest/tests.r01662" 
 		>
 		</testcase>
 		<testcase
 			name="r01665" 
-			classname="bin/varnishtest/tests/r01665" 
+			classname="bin/varnishtest/tests.r01665" 
 		>
 		</testcase>
 		<testcase
 			name="r01672" 
-			classname="bin/varnishtest/tests/r01672" 
+			classname="bin/varnishtest/tests.r01672" 
 		>
 		</testcase>
 		<testcase
 			name="r01684" 
-			classname="bin/varnishtest/tests/r01684" 
+			classname="bin/varnishtest/tests.r01684" 
 		>
 		</testcase>
 		<testcase
 			name="r01688" 
-			classname="bin/varnishtest/tests/r01688" 
+			classname="bin/varnishtest/tests.r01688" 
 		>
 		</testcase>
 		<testcase
 			name="r01691" 
-			classname="bin/varnishtest/tests/r01691" 
+			classname="bin/varnishtest/tests.r01691" 
 		>
 		</testcase>
 		<testcase
 			name="r01693" 
-			classname="bin/varnishtest/tests/r01693" 
+			classname="bin/varnishtest/tests.r01693" 
 		>
 		</testcase>
 		<testcase
 			name="r01729" 
-			classname="bin/varnishtest/tests/r01729" 
+			classname="bin/varnishtest/tests.r01729" 
 		>
 		</testcase>
 		<testcase
 			name="r01730" 
-			classname="bin/varnishtest/tests/r01730" 
+			classname="bin/varnishtest/tests.r01730" 
 		>
 		</testcase>
 		<testcase
 			name="r01737" 
-			classname="bin/varnishtest/tests/r01737" 
+			classname="bin/varnishtest/tests.r01737" 
 		>
 		</testcase>
 		<testcase
 			name="r01739" 
-			classname="bin/varnishtest/tests/r01739" 
+			classname="bin/varnishtest/tests.r01739" 
 		>
 		</testcase>
 		<testcase
 			name="r01746" 
-			classname="bin/varnishtest/tests/r01746" 
+			classname="bin/varnishtest/tests.r01746" 
 		>
 		</testcase>
 		<testcase
 			name="r01755" 
-			classname="bin/varnishtest/tests/r01755" 
+			classname="bin/varnishtest/tests.r01755" 
 		>
 		</testcase>
 		<testcase
 			name="r01761" 
-			classname="bin/varnishtest/tests/r01761" 
+			classname="bin/varnishtest/tests.r01761" 
 		>
 		</testcase>
 		<testcase
 			name="r01762" 
-			classname="bin/varnishtest/tests/r01762" 
+			classname="bin/varnishtest/tests.r01762" 
 		>
 		</testcase>
 		<testcase
 			name="r01764" 
-			classname="bin/varnishtest/tests/r01764" 
+			classname="bin/varnishtest/tests.r01764" 
 		>
 		</testcase>
 		<testcase
 			name="r01765" 
-			classname="bin/varnishtest/tests/r01765" 
+			classname="bin/varnishtest/tests.r01765" 
 		>
 		</testcase>
 		<testcase
 			name="r01768" 
-			classname="bin/varnishtest/tests/r01768" 
+			classname="bin/varnishtest/tests.r01768" 
 		>
 		</testcase>
 		<testcase
 			name="r01772" 
-			classname="bin/varnishtest/tests/r01772" 
+			classname="bin/varnishtest/tests.r01772" 
 		>
 		</testcase>
 		<testcase
 			name="r01775" 
-			classname="bin/varnishtest/tests/r01775" 
+			classname="bin/varnishtest/tests.r01775" 
 		>
 		</testcase>
 		<testcase
 			name="r01777" 
-			classname="bin/varnishtest/tests/r01777" 
+			classname="bin/varnishtest/tests.r01777" 
 		>
 		</testcase>
 		<testcase
 			name="r01781" 
-			classname="bin/varnishtest/tests/r01781" 
+			classname="bin/varnishtest/tests.r01781" 
 		>
 		</testcase>
 		<testcase
 			name="r01783" 
-			classname="bin/varnishtest/tests/r01783" 
+			classname="bin/varnishtest/tests.r01783" 
 		>
 		</testcase>
 		<testcase
 			name="r01801" 
-			classname="bin/varnishtest/tests/r01801" 
+			classname="bin/varnishtest/tests.r01801" 
 		>
 		</testcase>
 		<testcase
 			name="r01804" 
-			classname="bin/varnishtest/tests/r01804" 
+			classname="bin/varnishtest/tests.r01804" 
 		>
 		</testcase>
 		<testcase
 			name="r01806" 
-			classname="bin/varnishtest/tests/r01806" 
+			classname="bin/varnishtest/tests.r01806" 
 		>
 		</testcase>
 		<testcase
 			name="r01807" 
-			classname="bin/varnishtest/tests/r01807" 
+			classname="bin/varnishtest/tests.r01807" 
 		>
 		</testcase>
 		<testcase
 			name="r01810" 
-			classname="bin/varnishtest/tests/r01810" 
+			classname="bin/varnishtest/tests.r01810" 
 		>
 		</testcase>
 		<testcase
 			name="r01818" 
-			classname="bin/varnishtest/tests/r01818" 
+			classname="bin/varnishtest/tests.r01818" 
 		>
 		</testcase>
 		<testcase
 			name="r01821" 
-			classname="bin/varnishtest/tests/r01821" 
+			classname="bin/varnishtest/tests.r01821" 
 		>
 		</testcase>
 		<testcase
 			name="r01826" 
-			classname="bin/varnishtest/tests/r01826" 
+			classname="bin/varnishtest/tests.r01826" 
 		>
 		</testcase>
 		<testcase
 			name="r01834" 
-			classname="bin/varnishtest/tests/r01834" 
+			classname="bin/varnishtest/tests.r01834" 
 		>
 		</testcase>
 		<testcase
 			name="r01837" 
-			classname="bin/varnishtest/tests/r01837" 
+			classname="bin/varnishtest/tests.r01837" 
 		>
 		</testcase>
 		<testcase
 			name="r01838" 
-			classname="bin/varnishtest/tests/r01838" 
+			classname="bin/varnishtest/tests.r01838" 
 		>
 		</testcase>
 		<testcase
 			name="r01843" 
-			classname="bin/varnishtest/tests/r01843" 
+			classname="bin/varnishtest/tests.r01843" 
 		>
 		</testcase>
 		<testcase
 			name="r01847" 
-			classname="bin/varnishtest/tests/r01847" 
+			classname="bin/varnishtest/tests.r01847" 
 		>
 		</testcase>
 		<testcase
 			name="r01856" 
-			classname="bin/varnishtest/tests/r01856" 
+			classname="bin/varnishtest/tests.r01856" 
 		>
 		</testcase>
 		<testcase
 			name="r01857" 
-			classname="bin/varnishtest/tests/r01857" 
+			classname="bin/varnishtest/tests.r01857" 
 		>
 		</testcase>
 		<testcase
 			name="r01858" 
-			classname="bin/varnishtest/tests/r01858" 
+			classname="bin/varnishtest/tests.r01858" 
 		>
 		</testcase>
 		<testcase
 			name="r01878" 
-			classname="bin/varnishtest/tests/r01878" 
+			classname="bin/varnishtest/tests.r01878" 
 		>
 		</testcase>
 		<testcase
 			name="r01879" 
-			classname="bin/varnishtest/tests/r01879" 
+			classname="bin/varnishtest/tests.r01879" 
 		>
 		</testcase>
 		<testcase
 			name="r01881" 
-			classname="bin/varnishtest/tests/r01881" 
+			classname="bin/varnishtest/tests.r01881" 
 		>
 		</testcase>
 		<testcase
 			name="r01890" 
-			classname="bin/varnishtest/tests/r01890" 
+			classname="bin/varnishtest/tests.r01890" 
 		>
 		</testcase>
 		<testcase
 			name="r01914" 
-			classname="bin/varnishtest/tests/r01914" 
+			classname="bin/varnishtest/tests.r01914" 
 		>
 		</testcase>
 		<testcase
 			name="r01918" 
-			classname="bin/varnishtest/tests/r01918" 
+			classname="bin/varnishtest/tests.r01918" 
 		>
 		</testcase>
 		<testcase
 			name="r01924" 
-			classname="bin/varnishtest/tests/r01924" 
+			classname="bin/varnishtest/tests.r01924" 
 		>
 		</testcase>
 		<testcase
 			name="r01927" 
-			classname="bin/varnishtest/tests/r01927" 
+			classname="bin/varnishtest/tests.r01927" 
 		>
 		</testcase>
 		<testcase
 			name="r01941" 
-			classname="bin/varnishtest/tests/r01941" 
+			classname="bin/varnishtest/tests.r01941" 
 		>
 		</testcase>
 		<testcase
 			name="r01953" 
-			classname="bin/varnishtest/tests/r01953" 
+			classname="bin/varnishtest/tests.r01953" 
 		>
 		</testcase>
 		<testcase
 			name="r01955" 
-			classname="bin/varnishtest/tests/r01955" 
+			classname="bin/varnishtest/tests.r01955" 
 		>
 		</testcase>
 		<testcase
 			name="r01956" 
-			classname="bin/varnishtest/tests/r01956" 
+			classname="bin/varnishtest/tests.r01956" 
 		>
 		</testcase>
 		<testcase
 			name="r01990" 
-			classname="bin/varnishtest/tests/r01990" 
+			classname="bin/varnishtest/tests.r01990" 
 		>
 		</testcase>
 		<testcase
 			name="r02035" 
-			classname="bin/varnishtest/tests/r02035" 
+			classname="bin/varnishtest/tests.r02035" 
 		>
 		</testcase>
 		<testcase
 			name="r02036" 
-			classname="bin/varnishtest/tests/r02036" 
+			classname="bin/varnishtest/tests.r02036" 
 		>
 		</testcase>
 		<testcase
 			name="r02042" 
-			classname="bin/varnishtest/tests/r02042" 
+			classname="bin/varnishtest/tests.r02042" 
 		>
 		</testcase>
 		<testcase
 			name="r02069" 
-			classname="bin/varnishtest/tests/r02069" 
+			classname="bin/varnishtest/tests.r02069" 
 		>
 		</testcase>
 		<testcase
 			name="r02084" 
-			classname="bin/varnishtest/tests/r02084" 
+			classname="bin/varnishtest/tests.r02084" 
 		>
 		</testcase>
 		<testcase
 			name="r02105" 
-			classname="bin/varnishtest/tests/r02105" 
+			classname="bin/varnishtest/tests.r02105" 
 		>
 		</testcase>
 		<testcase
 			name="r02135" 
-			classname="bin/varnishtest/tests/r02135" 
+			classname="bin/varnishtest/tests.r02135" 
 		>
 		</testcase>
 		<testcase
 			name="r02142" 
-			classname="bin/varnishtest/tests/r02142" 
+			classname="bin/varnishtest/tests.r02142" 
 		>
 		</testcase>
 		<testcase
 			name="r02148" 
-			classname="bin/varnishtest/tests/r02148" 
+			classname="bin/varnishtest/tests.r02148" 
 		>
 		</testcase>
 		<testcase
 			name="r02157" 
-			classname="bin/varnishtest/tests/r02157" 
+			classname="bin/varnishtest/tests.r02157" 
 		>
 		</testcase>
 		<testcase
 			name="r02175" 
-			classname="bin/varnishtest/tests/r02175" 
+			classname="bin/varnishtest/tests.r02175" 
 		>
 		</testcase>
 		<testcase
 			name="r02177" 
-			classname="bin/varnishtest/tests/r02177" 
+			classname="bin/varnishtest/tests.r02177" 
 		>
 		</testcase>
 		<testcase
 			name="r02219" 
-			classname="bin/varnishtest/tests/r02219" 
+			classname="bin/varnishtest/tests.r02219" 
 		>
 		</testcase>
 		<testcase
 			name="r02233" 
-			classname="bin/varnishtest/tests/r02233" 
+			classname="bin/varnishtest/tests.r02233" 
 		>
 		</testcase>
 		<testcase
 			name="r02258" 
-			classname="bin/varnishtest/tests/r02258" 
+			classname="bin/varnishtest/tests.r02258" 
 		>
 		</testcase>
 		<testcase
 			name="r02262" 
-			classname="bin/varnishtest/tests/r02262" 
+			classname="bin/varnishtest/tests.r02262" 
 		>
 		</testcase>
 		<testcase
 			name="r02266" 
-			classname="bin/varnishtest/tests/r02266" 
+			classname="bin/varnishtest/tests.r02266" 
 		>
 		</testcase>
 		<testcase
 			name="r02270" 
-			classname="bin/varnishtest/tests/r02270" 
+			classname="bin/varnishtest/tests.r02270" 
 		>
 		</testcase>
 		<testcase
 			name="r02275" 
-			classname="bin/varnishtest/tests/r02275" 
+			classname="bin/varnishtest/tests.r02275" 
 		>
 			<skipped/>
 		</testcase>
 		<testcase
 			name="r02291" 
-			classname="bin/varnishtest/tests/r02291" 
+			classname="bin/varnishtest/tests.r02291" 
 		>
 		</testcase>
 		<testcase
 			name="r02300" 
-			classname="bin/varnishtest/tests/r02300" 
+			classname="bin/varnishtest/tests.r02300" 
 		>
 		</testcase>
 		<testcase
 			name="r02305" 
-			classname="bin/varnishtest/tests/r02305" 
+			classname="bin/varnishtest/tests.r02305" 
 		>
 		</testcase>
 		<testcase
 			name="r02307" 
-			classname="bin/varnishtest/tests/r02307" 
+			classname="bin/varnishtest/tests.r02307" 
 		>
 		</testcase>
 		<testcase
 			name="r02310" 
-			classname="bin/varnishtest/tests/r02310" 
+			classname="bin/varnishtest/tests.r02310" 
 		>
 		</testcase>
 		<testcase
 			name="r02319" 
-			classname="bin/varnishtest/tests/r02319" 
+			classname="bin/varnishtest/tests.r02319" 
 		>
 		</testcase>
 		<testcase
 			name="r02321" 
-			classname="bin/varnishtest/tests/r02321" 
+			classname="bin/varnishtest/tests.r02321" 
 		>
 		</testcase>
 		<testcase
 			name="r02325" 
-			classname="bin/varnishtest/tests/r02325" 
+			classname="bin/varnishtest/tests.r02325" 
 		>
 		</testcase>
 		<testcase
 			name="r02339" 
-			classname="bin/varnishtest/tests/r02339" 
+			classname="bin/varnishtest/tests.r02339" 
 		>
 		</testcase>
 		<testcase
 			name="r02342" 
-			classname="bin/varnishtest/tests/r02342" 
+			classname="bin/varnishtest/tests.r02342" 
 		>
 		</testcase>
 		<testcase
 			name="r02351" 
-			classname="bin/varnishtest/tests/r02351" 
+			classname="bin/varnishtest/tests.r02351" 
 		>
 		</testcase>
 		<testcase
 			name="r02367" 
-			classname="bin/varnishtest/tests/r02367" 
+			classname="bin/varnishtest/tests.r02367" 
 		>
 		</testcase>
 		<testcase
 			name="r02372" 
-			classname="bin/varnishtest/tests/r02372" 
+			classname="bin/varnishtest/tests.r02372" 
 		>
 		</testcase>
 		<testcase
 			name="r02387" 
-			classname="bin/varnishtest/tests/r02387" 
+			classname="bin/varnishtest/tests.r02387" 
 		>
 		</testcase>
 		<testcase
 			name="r02406" 
-			classname="bin/varnishtest/tests/r02406" 
+			classname="bin/varnishtest/tests.r02406" 
 		>
 		</testcase>
 		<testcase
 			name="r02413" 
-			classname="bin/varnishtest/tests/r02413" 
+			classname="bin/varnishtest/tests.r02413" 
 		>
 		</testcase>
 		<testcase
 			name="r02422" 
-			classname="bin/varnishtest/tests/r02422" 
+			classname="bin/varnishtest/tests.r02422" 
 		>
 		</testcase>
 		<testcase
 			name="r02429" 
-			classname="bin/varnishtest/tests/r02429" 
+			classname="bin/varnishtest/tests.r02429" 
 		>
 		</testcase>
 		<testcase
 			name="r02432" 
-			classname="bin/varnishtest/tests/r02432" 
+			classname="bin/varnishtest/tests.r02432" 
 		>
 		</testcase>
 		<testcase
 			name="r02433" 
-			classname="bin/varnishtest/tests/r02433" 
+			classname="bin/varnishtest/tests.r02433" 
 		>
 		</testcase>
 		<testcase
 			name="r02451" 
-			classname="bin/varnishtest/tests/r02451" 
+			classname="bin/varnishtest/tests.r02451" 
 		>
 		</testcase>
 		<testcase
 			name="r02488" 
-			classname="bin/varnishtest/tests/r02488" 
+			classname="bin/varnishtest/tests.r02488" 
 		>
 		</testcase>
 		<testcase
 			name="r02494" 
-			classname="bin/varnishtest/tests/r02494" 
+			classname="bin/varnishtest/tests.r02494" 
 		>
 		</testcase>
 		<testcase
 			name="r02527" 
-			classname="bin/varnishtest/tests/r02527" 
+			classname="bin/varnishtest/tests.r02527" 
 		>
 		</testcase>
 		<testcase
 			name="r02530" 
-			classname="bin/varnishtest/tests/r02530" 
+			classname="bin/varnishtest/tests.r02530" 
 		>
 		</testcase>
 		<testcase
 			name="r02539" 
-			classname="bin/varnishtest/tests/r02539" 
+			classname="bin/varnishtest/tests.r02539" 
 		>
 		</testcase>
 		<testcase
 			name="r02554" 
-			classname="bin/varnishtest/tests/r02554" 
+			classname="bin/varnishtest/tests.r02554" 
 		>
 		</testcase>
 		<testcase
 			name="r02555" 
-			classname="bin/varnishtest/tests/r02555" 
+			classname="bin/varnishtest/tests.r02555" 
 		>
 		</testcase>
 		<testcase
 			name="r02563" 
-			classname="bin/varnishtest/tests/r02563" 
+			classname="bin/varnishtest/tests.r02563" 
 		>
 		</testcase>
 		<testcase
 			name="r02617" 
-			classname="bin/varnishtest/tests/r02617" 
+			classname="bin/varnishtest/tests.r02617" 
 		>
 		</testcase>
 		<testcase
 			name="r02618" 
-			classname="bin/varnishtest/tests/r02618" 
+			classname="bin/varnishtest/tests.r02618" 
 		>
 		</testcase>
 		<testcase
 			name="r02633" 
-			classname="bin/varnishtest/tests/r02633" 
+			classname="bin/varnishtest/tests.r02633" 
 		>
 		</testcase>
 		<testcase
 			name="r02645" 
-			classname="bin/varnishtest/tests/r02645" 
+			classname="bin/varnishtest/tests.r02645" 
 		>
 		</testcase>
 		<testcase
 			name="r02646" 
-			classname="bin/varnishtest/tests/r02646" 
+			classname="bin/varnishtest/tests.r02646" 
 		>
 		</testcase>
 		<testcase
 			name="r02647" 
-			classname="bin/varnishtest/tests/r02647" 
+			classname="bin/varnishtest/tests.r02647" 
 		>
 		</testcase>
 		<testcase
 			name="r02649" 
-			classname="bin/varnishtest/tests/r02649" 
+			classname="bin/varnishtest/tests.r02649" 
 		>
 		</testcase>
 		<testcase
 			name="r02679" 
-			classname="bin/varnishtest/tests/r02679" 
+			classname="bin/varnishtest/tests.r02679" 
 		>
 		</testcase>
 		<testcase
 			name="r02686" 
-			classname="bin/varnishtest/tests/r02686" 
+			classname="bin/varnishtest/tests.r02686" 
 		>
 		</testcase>
 		<testcase
 			name="r02690" 
-			classname="bin/varnishtest/tests/r02690" 
+			classname="bin/varnishtest/tests.r02690" 
 		>
 		</testcase>
 		<testcase
 			name="r02700" 
-			classname="bin/varnishtest/tests/r02700" 
+			classname="bin/varnishtest/tests.r02700" 
 		>
 		</testcase>
 		<testcase
 			name="r02702" 
-			classname="bin/varnishtest/tests/r02702" 
+			classname="bin/varnishtest/tests.r02702" 
 		>
 		</testcase>
 		<testcase
 			name="r02705" 
-			classname="bin/varnishtest/tests/r02705" 
+			classname="bin/varnishtest/tests.r02705" 
 		>
 		</testcase>
 		<testcase
 			name="s00000" 
-			classname="bin/varnishtest/tests/s00000" 
+			classname="bin/varnishtest/tests.s00000" 
 		>
 		</testcase>
 		<testcase
 			name="s00001" 
-			classname="bin/varnishtest/tests/s00001" 
+			classname="bin/varnishtest/tests.s00001" 
 		>
 		</testcase>
 		<testcase
 			name="s00002" 
-			classname="bin/varnishtest/tests/s00002" 
+			classname="bin/varnishtest/tests.s00002" 
 		>
 		</testcase>
 		<testcase
 			name="s00003" 
-			classname="bin/varnishtest/tests/s00003" 
+			classname="bin/varnishtest/tests.s00003" 
 		>
 		</testcase>
 		<testcase
 			name="s00004" 
-			classname="bin/varnishtest/tests/s00004" 
+			classname="bin/varnishtest/tests.s00004" 
 		>
 		</testcase>
 		<testcase
 			name="s00005" 
-			classname="bin/varnishtest/tests/s00005" 
+			classname="bin/varnishtest/tests.s00005" 
 		>
 		</testcase>
 		<testcase
 			name="s00006" 
-			classname="bin/varnishtest/tests/s00006" 
+			classname="bin/varnishtest/tests.s00006" 
 		>
 		</testcase>
 		<testcase
 			name="s00007" 
-			classname="bin/varnishtest/tests/s00007" 
+			classname="bin/varnishtest/tests.s00007" 
 		>
 		</testcase>
 		<testcase
 			name="s00008" 
-			classname="bin/varnishtest/tests/s00008" 
+			classname="bin/varnishtest/tests.s00008" 
 		>
 		</testcase>
 		<testcase
 			name="s00009" 
-			classname="bin/varnishtest/tests/s00009" 
+			classname="bin/varnishtest/tests.s00009" 
 		>
 		</testcase>
 		<testcase
 			name="t00000" 
-			classname="bin/varnishtest/tests/t00000" 
+			classname="bin/varnishtest/tests.t00000" 
 		>
 		</testcase>
 		<testcase
 			name="t00001" 
-			classname="bin/varnishtest/tests/t00001" 
+			classname="bin/varnishtest/tests.t00001" 
 		>
 		</testcase>
 		<testcase
 			name="t00002" 
-			classname="bin/varnishtest/tests/t00002" 
+			classname="bin/varnishtest/tests.t00002" 
 		>
 		</testcase>
 		<testcase
 			name="t00003" 
-			classname="bin/varnishtest/tests/t00003" 
+			classname="bin/varnishtest/tests.t00003" 
 		>
 		</testcase>
 		<testcase
 			name="t00004" 
-			classname="bin/varnishtest/tests/t00004" 
+			classname="bin/varnishtest/tests.t00004" 
 		>
 		</testcase>
 		<testcase
 			name="t02000" 
-			classname="bin/varnishtest/tests/t02000" 
+			classname="bin/varnishtest/tests.t02000" 
 		>
 		</testcase>
 		<testcase
 			name="t02001" 
-			classname="bin/varnishtest/tests/t02001" 
+			classname="bin/varnishtest/tests.t02001" 
 		>
 		</testcase>
 		<testcase
 			name="t02002" 
-			classname="bin/varnishtest/tests/t02002" 
+			classname="bin/varnishtest/tests.t02002" 
 		>
 		</testcase>
 		<testcase
 			name="t02003" 
-			classname="bin/varnishtest/tests/t02003" 
+			classname="bin/varnishtest/tests.t02003" 
 		>
 		</testcase>
 		<testcase
 			name="t02004" 
-			classname="bin/varnishtest/tests/t02004" 
+			classname="bin/varnishtest/tests.t02004" 
 		>
 		</testcase>
 		<testcase
 			name="t02005" 
-			classname="bin/varnishtest/tests/t02005" 
+			classname="bin/varnishtest/tests.t02005" 
 		>
 		</testcase>
 		<testcase
 			name="t02006" 
-			classname="bin/varnishtest/tests/t02006" 
+			classname="bin/varnishtest/tests.t02006" 
 		>
 		</testcase>
 		<testcase
 			name="t02007" 
-			classname="bin/varnishtest/tests/t02007" 
+			classname="bin/varnishtest/tests.t02007" 
 		>
 		</testcase>
 		<testcase
 			name="t02008" 
-			classname="bin/varnishtest/tests/t02008" 
+			classname="bin/varnishtest/tests.t02008" 
 		>
 		</testcase>
 		<testcase
 			name="t02009" 
-			classname="bin/varnishtest/tests/t02009" 
+			classname="bin/varnishtest/tests.t02009" 
 		>
 		</testcase>
 		<testcase
 			name="t02010" 
-			classname="bin/varnishtest/tests/t02010" 
+			classname="bin/varnishtest/tests.t02010" 
 		>
 		</testcase>
 		<testcase
 			name="t02011" 
-			classname="bin/varnishtest/tests/t02011" 
+			classname="bin/varnishtest/tests.t02011" 
 		>
 		</testcase>
 		<testcase
 			name="t02012" 
-			classname="bin/varnishtest/tests/t02012" 
+			classname="bin/varnishtest/tests.t02012" 
 		>
 		</testcase>
 		<testcase
 			name="t02013" 
-			classname="bin/varnishtest/tests/t02013" 
+			classname="bin/varnishtest/tests.t02013" 
 		>
 		</testcase>
 		<testcase
 			name="t02014" 
-			classname="bin/varnishtest/tests/t02014" 
+			classname="bin/varnishtest/tests.t02014" 
 		>
 		</testcase>
 		<testcase
 			name="u00000" 
-			classname="bin/varnishtest/tests/u00000" 
+			classname="bin/varnishtest/tests.u00000" 
 		>
 		</testcase>
 		<testcase
 			name="u00003" 
-			classname="bin/varnishtest/tests/u00003" 
+			classname="bin/varnishtest/tests.u00003" 
 		>
 		</testcase>
 		<testcase
 			name="u00004" 
-			classname="bin/varnishtest/tests/u00004" 
+			classname="bin/varnishtest/tests.u00004" 
 		>
 		</testcase>
 		<testcase
 			name="u00005" 
-			classname="bin/varnishtest/tests/u00005" 
+			classname="bin/varnishtest/tests.u00005" 
 		>
 		</testcase>
 		<testcase
 			name="u00006" 
-			classname="bin/varnishtest/tests/u00006" 
+			classname="bin/varnishtest/tests.u00006" 
 		>
 		</testcase>
 		<testcase
 			name="u00007" 
-			classname="bin/varnishtest/tests/u00007" 
+			classname="bin/varnishtest/tests.u00007" 
 		>
 		</testcase>
 		<testcase
 			name="u00009" 
-			classname="bin/varnishtest/tests/u00009" 
+			classname="bin/varnishtest/tests.u00009" 
 		>
 		</testcase>
 		<testcase
 			name="u00010" 
-			classname="bin/varnishtest/tests/u00010" 
+			classname="bin/varnishtest/tests.u00010" 
 		>
 		</testcase>
 		<testcase
 			name="u00011" 
-			classname="bin/varnishtest/tests/u00011" 
+			classname="bin/varnishtest/tests.u00011" 
 		>
 		</testcase>
 		<testcase
 			name="u00012" 
-			classname="bin/varnishtest/tests/u00012" 
+			classname="bin/varnishtest/tests.u00012" 
 		>
 		</testcase>
 		<testcase
 			name="u00013" 
-			classname="bin/varnishtest/tests/u00013" 
+			classname="bin/varnishtest/tests.u00013" 
 		>
 		</testcase>
 		<testcase
 			name="v00000" 
-			classname="bin/varnishtest/tests/v00000" 
+			classname="bin/varnishtest/tests.v00000" 
 		>
 		</testcase>
 		<testcase
 			name="v00001" 
-			classname="bin/varnishtest/tests/v00001" 
+			classname="bin/varnishtest/tests.v00001" 
 		>
 		</testcase>
 		<testcase
 			name="v00002" 
-			classname="bin/varnishtest/tests/v00002" 
+			classname="bin/varnishtest/tests.v00002" 
 		>
 		</testcase>
 		<testcase
 			name="v00003" 
-			classname="bin/varnishtest/tests/v00003" 
+			classname="bin/varnishtest/tests.v00003" 
 		>
 		</testcase>
 		<testcase
 			name="v00005" 
-			classname="bin/varnishtest/tests/v00005" 
+			classname="bin/varnishtest/tests.v00005" 
 		>
 		</testcase>
 		<testcase
 			name="v00006" 
-			classname="bin/varnishtest/tests/v00006" 
+			classname="bin/varnishtest/tests.v00006" 
 		>
 		</testcase>
 		<testcase
 			name="v00008" 
-			classname="bin/varnishtest/tests/v00008" 
+			classname="bin/varnishtest/tests.v00008" 
 		>
 		</testcase>
 		<testcase
 			name="v00010" 
-			classname="bin/varnishtest/tests/v00010" 
+			classname="bin/varnishtest/tests.v00010" 
 		>
 		</testcase>
 		<testcase
 			name="v00011" 
-			classname="bin/varnishtest/tests/v00011" 
+			classname="bin/varnishtest/tests.v00011" 
 		>
 		</testcase>
 		<testcase
 			name="v00012" 
-			classname="bin/varnishtest/tests/v00012" 
+			classname="bin/varnishtest/tests.v00012" 
 		>
 		</testcase>
 		<testcase
 			name="v00013" 
-			classname="bin/varnishtest/tests/v00013" 
+			classname="bin/varnishtest/tests.v00013" 
 		>
 		</testcase>
 		<testcase
 			name="v00014" 
-			classname="bin/varnishtest/tests/v00014" 
+			classname="bin/varnishtest/tests.v00014" 
 		>
 		</testcase>
 		<testcase
 			name="v00015" 
-			classname="bin/varnishtest/tests/v00015" 
+			classname="bin/varnishtest/tests.v00015" 
 		>
 		</testcase>
 		<testcase
 			name="v00016" 
-			classname="bin/varnishtest/tests/v00016" 
+			classname="bin/varnishtest/tests.v00016" 
 		>
 		</testcase>
 		<testcase
 			name="v00017" 
-			classname="bin/varnishtest/tests/v00017" 
+			classname="bin/varnishtest/tests.v00017" 
 		>
 		</testcase>
 		<testcase
 			name="v00018" 
-			classname="bin/varnishtest/tests/v00018" 
+			classname="bin/varnishtest/tests.v00018" 
 		>
 		</testcase>
 		<testcase
 			name="v00019" 
-			classname="bin/varnishtest/tests/v00019" 
+			classname="bin/varnishtest/tests.v00019" 
 		>
 		</testcase>
 		<testcase
 			name="v00020" 
-			classname="bin/varnishtest/tests/v00020" 
+			classname="bin/varnishtest/tests.v00020" 
 		>
 		</testcase>
 		<testcase
 			name="v00021" 
-			classname="bin/varnishtest/tests/v00021" 
+			classname="bin/varnishtest/tests.v00021" 
 		>
 		</testcase>
 		<testcase
 			name="v00024" 
-			classname="bin/varnishtest/tests/v00024" 
+			classname="bin/varnishtest/tests.v00024" 
 		>
 		</testcase>
 		<testcase
 			name="v00025" 
-			classname="bin/varnishtest/tests/v00025" 
+			classname="bin/varnishtest/tests.v00025" 
 		>
 		</testcase>
 		<testcase
 			name="v00027" 
-			classname="bin/varnishtest/tests/v00027" 
+			classname="bin/varnishtest/tests.v00027" 
 		>
 		</testcase>
 		<testcase
 			name="v00031" 
-			classname="bin/varnishtest/tests/v00031" 
+			classname="bin/varnishtest/tests.v00031" 
 		>
 		</testcase>
 		<testcase
 			name="v00032" 
-			classname="bin/varnishtest/tests/v00032" 
+			classname="bin/varnishtest/tests.v00032" 
 		>
 		</testcase>
 		<testcase
 			name="v00033" 
-			classname="bin/varnishtest/tests/v00033" 
+			classname="bin/varnishtest/tests.v00033" 
 		>
 		</testcase>
 		<testcase
 			name="v00034" 
-			classname="bin/varnishtest/tests/v00034" 
+			classname="bin/varnishtest/tests.v00034" 
 		>
 		</testcase>
 		<testcase
 			name="v00037" 
-			classname="bin/varnishtest/tests/v00037" 
+			classname="bin/varnishtest/tests.v00037" 
 		>
 		</testcase>
 		<testcase
 			name="v00038" 
-			classname="bin/varnishtest/tests/v00038" 
+			classname="bin/varnishtest/tests.v00038" 
 		>
 		</testcase>
 		<testcase
 			name="v00039" 
-			classname="bin/varnishtest/tests/v00039" 
+			classname="bin/varnishtest/tests.v00039" 
 		>
 		</testcase>
 		<testcase
 			name="v00040" 
-			classname="bin/varnishtest/tests/v00040" 
+			classname="bin/varnishtest/tests.v00040" 
 		>
 		</testcase>
 		<testcase
 			name="v00041" 
-			classname="bin/varnishtest/tests/v00041" 
+			classname="bin/varnishtest/tests.v00041" 
 		>
 		</testcase>
 		<testcase
 			name="v00042" 
-			classname="bin/varnishtest/tests/v00042" 
+			classname="bin/varnishtest/tests.v00042" 
 		>
 		</testcase>
 		<testcase
 			name="v00043" 
-			classname="bin/varnishtest/tests/v00043" 
+			classname="bin/varnishtest/tests.v00043" 
 		>
 		</testcase>
 		<testcase
 			name="v00045" 
-			classname="bin/varnishtest/tests/v00045" 
+			classname="bin/varnishtest/tests.v00045" 
 		>
 		</testcase>
 		<testcase
 			name="v00046" 
-			classname="bin/varnishtest/tests/v00046" 
+			classname="bin/varnishtest/tests.v00046" 
 		>
 		</testcase>
 		<testcase
 			name="v00047" 
-			classname="bin/varnishtest/tests/v00047" 
+			classname="bin/varnishtest/tests.v00047" 
 		>
 		</testcase>
 		<testcase
 			name="v00049" 
-			classname="bin/varnishtest/tests/v00049" 
+			classname="bin/varnishtest/tests.v00049" 
 		>
 		</testcase>
 		<testcase
 			name="v00050" 
-			classname="bin/varnishtest/tests/v00050" 
+			classname="bin/varnishtest/tests.v00050" 
 		>
 		</testcase>
 		<testcase
 			name="v00051" 
-			classname="bin/varnishtest/tests/v00051" 
+			classname="bin/varnishtest/tests.v00051" 
 		>
 		</testcase>
 		<testcase
 			name="v00052" 
-			classname="bin/varnishtest/tests/v00052" 
+			classname="bin/varnishtest/tests.v00052" 
 		>
 		</testcase>
 		<testcase
 			name="v00054" 
-			classname="bin/varnishtest/tests/v00054" 
+			classname="bin/varnishtest/tests.v00054" 
 		>
 		</testcase>
 		<testcase
 			name="v00055" 
-			classname="bin/varnishtest/tests/v00055" 
+			classname="bin/varnishtest/tests.v00055" 
 		>
 		</testcase>
 		<testcase
 			name="v00056" 
-			classname="bin/varnishtest/tests/v00056" 
+			classname="bin/varnishtest/tests.v00056" 
 		>
 		</testcase>
 		<testcase
 			name="v00057" 
-			classname="bin/varnishtest/tests/v00057" 
+			classname="bin/varnishtest/tests.v00057" 
 		>
 		</testcase>
 	</testsuite>
@@ -4409,192 +4409,192 @@ FAIL tests/c00094.vtc (exit status: 2)
 		>
 		<testcase
 			name="00001-generated-conf" 
-			classname="bin/vha-agent/tests/00001-generated-conf" 
+			classname="bin/vha-agent/tests.00001-generated-conf" 
 		>
 		</testcase>
 		<testcase
 			name="00002-host-header" 
-			classname="bin/vha-agent/tests/00002-host-header" 
+			classname="bin/vha-agent/tests.00002-host-header" 
 		>
 		</testcase>
 		<testcase
 			name="00003-host-header-with-port" 
-			classname="bin/vha-agent/tests/00003-host-header-with-port" 
+			classname="bin/vha-agent/tests.00003-host-header-with-port" 
 		>
 		</testcase>
 		<testcase
 			name="00004-reload" 
-			classname="bin/vha-agent/tests/00004-reload" 
+			classname="bin/vha-agent/tests.00004-reload" 
 		>
 		</testcase>
 		<testcase
 			name="00005-failed-reloads" 
-			classname="bin/vha-agent/tests/00005-failed-reloads" 
+			classname="bin/vha-agent/tests.00005-failed-reloads" 
 		>
 		</testcase>
 		<testcase
 			name="00006-head-method" 
-			classname="bin/vha-agent/tests/00006-head-method" 
+			classname="bin/vha-agent/tests.00006-head-method" 
 		>
 		</testcase>
 		<testcase
 			name="00007-slow-node" 
-			classname="bin/vha-agent/tests/00007-slow-node" 
+			classname="bin/vha-agent/tests.00007-slow-node" 
 		>
 		</testcase>
 		<testcase
 			name="00008-esi" 
-			classname="bin/vha-agent/tests/00008-esi" 
+			classname="bin/vha-agent/tests.00008-esi" 
 		>
 		</testcase>
 		<testcase
 			name="00009-esi_again" 
-			classname="bin/vha-agent/tests/00009-esi_again" 
+			classname="bin/vha-agent/tests.00009-esi_again" 
 		>
 		</testcase>
 		<testcase
 			name="00010-clusters" 
-			classname="bin/vha-agent/tests/00010-clusters" 
+			classname="bin/vha-agent/tests.00010-clusters" 
 		>
 		</testcase>
 		<testcase
 			name="00011-empty-conf" 
-			classname="bin/vha-agent/tests/00011-empty-conf" 
+			classname="bin/vha-agent/tests.00011-empty-conf" 
 		>
 		</testcase>
 		<testcase
 			name="00012-POST-reqs" 
-			classname="bin/vha-agent/tests/00012-POST-reqs" 
+			classname="bin/vha-agent/tests.00012-POST-reqs" 
 		>
 		</testcase>
 		<testcase
 			name="00013-complex-clusters" 
-			classname="bin/vha-agent/tests/00013-complex-clusters" 
+			classname="bin/vha-agent/tests.00013-complex-clusters" 
 		>
 		</testcase>
 		<testcase
 			name="00014-forbid" 
-			classname="bin/vha-agent/tests/00014-forbid" 
+			classname="bin/vha-agent/tests.00014-forbid" 
 		>
 		</testcase>
 		<testcase
 			name="00015-forbid-bereq" 
-			classname="bin/vha-agent/tests/00015-forbid-bereq" 
+			classname="bin/vha-agent/tests.00015-forbid-bereq" 
 		>
 		</testcase>
 		<testcase
 			name="00016-token" 
-			classname="bin/vha-agent/tests/00016-token" 
+			classname="bin/vha-agent/tests.00016-token" 
 		>
 		</testcase>
 		<testcase
 			name="00017-done-hdrs" 
-			classname="bin/vha-agent/tests/00017-done-hdrs" 
+			classname="bin/vha-agent/tests.00017-done-hdrs" 
 		>
 		</testcase>
 		<testcase
 			name="00018-add-hdrs" 
-			classname="bin/vha-agent/tests/00018-add-hdrs" 
+			classname="bin/vha-agent/tests.00018-add-hdrs" 
 		>
 		</testcase>
 		<testcase
 			name="00019-add-body" 
-			classname="bin/vha-agent/tests/00019-add-body" 
+			classname="bin/vha-agent/tests.00019-add-body" 
 		>
 		</testcase>
 		<testcase
 			name="00020-new-forbid" 
-			classname="bin/vha-agent/tests/00020-new-forbid" 
+			classname="bin/vha-agent/tests.00020-new-forbid" 
 		>
 		</testcase>
 		<testcase
 			name="00021-empty-headers" 
-			classname="bin/vha-agent/tests/00021-empty-headers" 
+			classname="bin/vha-agent/tests.00021-empty-headers" 
 		>
 		</testcase>
 		<testcase
 			name="00023-vxid" 
-			classname="bin/vha-agent/tests/00023-vxid" 
+			classname="bin/vha-agent/tests.00023-vxid" 
 		>
 		</testcase>
 		<testcase
 			name="00024-forbid-with-vmod" 
-			classname="bin/vha-agent/tests/00024-forbid-with-vmod" 
+			classname="bin/vha-agent/tests.00024-forbid-with-vmod" 
 		>
 		</testcase>
 		<testcase
 			name="00025-forbid-bereq-with-vmod" 
-			classname="bin/vha-agent/tests/00025-forbid-bereq-with-vmod" 
+			classname="bin/vha-agent/tests.00025-forbid-bereq-with-vmod" 
 		>
 		</testcase>
 		<testcase
 			name="00026-add-hdrs-via-vmod" 
-			classname="bin/vha-agent/tests/00026-add-hdrs-via-vmod" 
+			classname="bin/vha-agent/tests.00026-add-hdrs-via-vmod" 
 		>
 		</testcase>
 		<testcase
 			name="00027-add-body-via-vmod" 
-			classname="bin/vha-agent/tests/00027-add-body-via-vmod" 
+			classname="bin/vha-agent/tests.00027-add-body-via-vmod" 
 		>
 		</testcase>
 		<testcase
 			name="00028-stat-file" 
-			classname="bin/vha-agent/tests/00028-stat-file" 
+			classname="bin/vha-agent/tests.00028-stat-file" 
 		>
 		</testcase>
 		<testcase
 			name="00029-replication-failures" 
-			classname="bin/vha-agent/tests/00029-replication-failures" 
+			classname="bin/vha-agent/tests.00029-replication-failures" 
 		>
 		</testcase>
 		<testcase
 			name="00031-accept-header" 
-			classname="bin/vha-agent/tests/00031-accept-header" 
+			classname="bin/vha-agent/tests.00031-accept-header" 
 		>
 		</testcase>
 		<testcase
 			name="00032-cl-args" 
-			classname="bin/vha-agent/tests/00032-cl-args" 
+			classname="bin/vha-agent/tests.00032-cl-args" 
 		>
 		</testcase>
 		<testcase
 			name="00033-store-overflow" 
-			classname="bin/vha-agent/tests/00033-store-overflow" 
+			classname="bin/vha-agent/tests.00033-store-overflow" 
 		>
 		</testcase>
 		<testcase
 			name="00034-default-vcl" 
-			classname="bin/vha-agent/tests/00034-default-vcl" 
+			classname="bin/vha-agent/tests.00034-default-vcl" 
 		>
 		</testcase>
 		<testcase
 			name="00034-default-vcl-bis" 
-			classname="bin/vha-agent/tests/00034-default-vcl-bis" 
+			classname="bin/vha-agent/tests.00034-default-vcl-bis" 
 		>
 		</testcase>
 		<testcase
 			name="val_addr_bad_ip" 
-			classname="bin/vha-agent/tests/val_addr_bad_ip" 
+			classname="bin/vha-agent/tests.val_addr_bad_ip" 
 		>
 		</testcase>
 		<testcase
 			name="val_addr_bad_port" 
-			classname="bin/vha-agent/tests/val_addr_bad_port" 
+			classname="bin/vha-agent/tests.val_addr_bad_port" 
 		>
 		</testcase>
 		<testcase
 			name="val_addr_bad_proto" 
-			classname="bin/vha-agent/tests/val_addr_bad_proto" 
+			classname="bin/vha-agent/tests.val_addr_bad_proto" 
 		>
 		</testcase>
 		<testcase
 			name="val_addr_good_all" 
-			classname="bin/vha-agent/tests/val_addr_good_all" 
+			classname="bin/vha-agent/tests.val_addr_good_all" 
 		>
 		</testcase>
 		<testcase
 			name="val_name_dup" 
-			classname="bin/vha-agent/tests/val_name_dup" 
+			classname="bin/vha-agent/tests.val_name_dup" 
 		>
 		</testcase>
 	</testsuite>
@@ -4607,12 +4607,12 @@ FAIL tests/c00094.vtc (exit status: 2)
 		>
 		<testcase
 			name="vbm_test" 
-			classname="include/vbm_test" 
+			classname="include.vbm_test" 
 		>
 		</testcase>
 		<testcase
 			name="vrt_test" 
-			classname="include/vrt_test" 
+			classname="include.vrt_test" 
 		>
 		</testcase>
 	</testsuite>
@@ -4625,27 +4625,27 @@ FAIL tests/c00094.vtc (exit status: 2)
 		>
 		<testcase
 			name="mtest" 
-			classname="lib/liblmdb/mtest" 
+			classname="lib/liblmdb.mtest" 
 		>
 		</testcase>
 		<testcase
 			name="mtest2" 
-			classname="lib/liblmdb/mtest2" 
+			classname="lib/liblmdb.mtest2" 
 		>
 		</testcase>
 		<testcase
 			name="mtest3" 
-			classname="lib/liblmdb/mtest3" 
+			classname="lib/liblmdb.mtest3" 
 		>
 		</testcase>
 		<testcase
 			name="mtest4" 
-			classname="lib/liblmdb/mtest4" 
+			classname="lib/liblmdb.mtest4" 
 		>
 		</testcase>
 		<testcase
 			name="mtest5" 
-			classname="lib/liblmdb/mtest5" 
+			classname="lib/liblmdb.mtest5" 
 		>
 		</testcase>
 	</testsuite>
@@ -4658,7 +4658,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 		>
 		<testcase
 			name="journal_test" 
-			classname="lib/libmse/journal_test" 
+			classname="lib/libmse.journal_test" 
 		>
 		</testcase>
 	</testsuite>
@@ -4671,17 +4671,17 @@ FAIL tests/c00094.vtc (exit status: 2)
 		>
 		<testcase
 			name="binheap" 
-			classname="lib/libvarnish/binheap" 
+			classname="lib/libvarnish.binheap" 
 		>
 		</testcase>
 		<testcase
 			name="vjsn_test" 
-			classname="lib/libvarnish/vjsn_test" 
+			classname="lib/libvarnish.vjsn_test" 
 		>
 		</testcase>
 		<testcase
 			name="vnum_c_test" 
-			classname="lib/libvarnish/vnum_c_test" 
+			classname="lib/libvarnish.vnum_c_test" 
 		>
 		</testcase>
 	</testsuite>
@@ -4694,7 +4694,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 		>
 		<testcase
 			name="vsl_glob_test" 
-			classname="lib/libvarnishapi/vsl_glob_test" 
+			classname="lib/libvarnishapi.vsl_glob_test" 
 		>
 		</testcase>
 	</testsuite>