diff --git a/testenv/Test-Content-disposition-2.py b/testenv/Test-Content-disposition-2.py
index a6b1830a..c2512e16 100755
--- a/testenv/Test-Content-disposition-2.py
+++ b/testenv/Test-Content-disposition-2.py
@@ -20,9 +20,9 @@ A_File = WgetFile ("HTTP.Teapot", File1)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d --content-disposition"
-WGET_URLS = ["File2"]
+WGET_URLS = [["File2"]]
 
-Files = [B_File]
+Files = [[B_File]]
 Existing_Files = [A_File]
 
 ExpectedReturnCode = 0
diff --git a/testenv/Test-Content-disposition.py b/testenv/Test-Content-disposition.py
index fc164380..0a81dea2 100755
--- a/testenv/Test-Content-disposition.py
+++ b/testenv/Test-Content-disposition.py
@@ -25,9 +25,9 @@ File1_rules = {
 A_File = WgetFile ("LOTR", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --content-disposition"
-WGET_URLS = ["LOTR"]
+WGET_URLS = [["LOTR"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [WgetFile ("JRR.Tolkein", File1)]
diff --git a/testenv/Test-Head.py b/testenv/Test-Head.py
index 3899cfe6..49aaa411 100755
--- a/testenv/Test-Head.py
+++ b/testenv/Test-Head.py
@@ -13,9 +13,9 @@ File1 = "You shall not pass!"
 A_File = WgetFile ("File1", File1)
 
 WGET_OPTIONS = "-d --method=HEAD"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = []
diff --git a/testenv/Test-O.py b/testenv/Test-O.py
index 464a426c..613fbcdb 100755
--- a/testenv/Test-O.py
+++ b/testenv/Test-O.py
@@ -13,9 +13,9 @@ File1 = "Test Contents."
 A_File = WgetFile ("File1", File1)
 
 WGET_OPTIONS = "-d -O NewFile.txt"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 ExistingFiles = [A_File]
 
 ExpectedReturnCode = 0
diff --git a/testenv/Test-Post.py b/testenv/Test-Post.py
index 17294eb2..632326fd 100755
--- a/testenv/Test-Post.py
+++ b/testenv/Test-Post.py
@@ -17,9 +17,9 @@ TestMessage"""
 A_File = WgetFile ("File1", File1)
 
 WGET_OPTIONS = "-d --method=post --body-data=TestMessage"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [WgetFile ("File1", File1_response)]
diff --git a/testenv/Test-Proto.py b/testenv/Test-Proto.py
index 5b2bad47..03523e5a 100755
--- a/testenv/Test-Proto.py
+++ b/testenv/Test-Proto.py
@@ -38,9 +38,9 @@ B_File = WgetFile ("File2", File2, rules=File2_rules)
 C_File = WgetFile ("File3", File3)
 
 WGET_OPTIONS = "-d --content-disposition --user=Sauron --password=TheEye"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 Existing_Files = [C_File]
 
 ExpectedReturnCode = 0
diff --git a/testenv/Test-auth-basic-fail.py b/testenv/Test-auth-basic-fail.py
index 3e2f3b52..894e96dd 100755
--- a/testenv/Test-auth-basic-fail.py
+++ b/testenv/Test-auth-basic-fail.py
@@ -20,9 +20,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --user=Sauron --password=Eye"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 6
 ExpectedDownloadedFiles = []
diff --git a/testenv/Test-auth-basic.py b/testenv/Test-auth-basic.py
index 324c0249..96141e08 100755
--- a/testenv/Test-auth-basic.py
+++ b/testenv/Test-auth-basic.py
@@ -28,9 +28,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d --user=Sauron --password=TheEye"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File]
diff --git a/testenv/Test-auth-both.py b/testenv/Test-auth-both.py
index 16121975..98371348 100755
--- a/testenv/Test-auth-both.py
+++ b/testenv/Test-auth-both.py
@@ -46,9 +46,9 @@ B_File = WgetFile ("File2", File2, rules=File2_rules)
 C_File = WgetFile ("File3", File3, rules=File3_rules)
 
 WGET_OPTIONS = "-d --user=Sauron --password=TheEye"
-WGET_URLS = ["File1", "File2", "File3"]
+WGET_URLS = [["File1", "File2", "File3"]]
 
-Files = [A_File, B_File, C_File]
+Files = [[A_File, B_File, C_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File, C_File]
diff --git a/testenv/Test-auth-digest.py b/testenv/Test-auth-digest.py
index 449cdd0d..a66b2c97 100755
--- a/testenv/Test-auth-digest.py
+++ b/testenv/Test-auth-digest.py
@@ -19,9 +19,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --user=Pacman --password=Omnomnom"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File]
diff --git a/testenv/Test-auth-no-challenge-url.py b/testenv/Test-auth-no-challenge-url.py
index 84aa6738..eb88ac5f 100755
--- a/testenv/Test-auth-no-challenge-url.py
+++ b/testenv/Test-auth-no-challenge-url.py
@@ -23,9 +23,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --auth-no-challenge http://Pacman:Omnomnom@localhost:{{port}}/File1"
-WGET_URLS = []
+WGET_URLS = [[]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File]
diff --git a/testenv/Test-auth-no-challenge.py b/testenv/Test-auth-no-challenge.py
index ab7b297a..774bd59a 100755
--- a/testenv/Test-auth-no-challenge.py
+++ b/testenv/Test-auth-no-challenge.py
@@ -23,9 +23,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --auth-no-challenge --user=Pacman --password=Omnomnom"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File]
diff --git a/testenv/Test-auth-retcode.py b/testenv/Test-auth-retcode.py
index 27c41704..adbcbb05 100755
--- a/testenv/Test-auth-retcode.py
+++ b/testenv/Test-auth-retcode.py
@@ -19,9 +19,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 8
 ExpectedDownloadedFiles = []
diff --git a/testenv/Test-auth-with-content-disposition.py b/testenv/Test-auth-with-content-disposition.py
index d39a9fa1..50e08ba2 100755
--- a/testenv/Test-auth-with-content-disposition.py
+++ b/testenv/Test-auth-with-content-disposition.py
@@ -23,9 +23,9 @@ File1_rules = {
 A_File = WgetFile ("File1", File1, rules=File1_rules)
 
 WGET_OPTIONS = "-d --user=Pacman --password=Omnomnom --content-disposition"
-WGET_URLS = ["File1"]
+WGET_URLS = [["File1"]]
 
-Files = [A_File]
+Files = [[A_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [WgetFile ("Arch", File1)]
diff --git a/testenv/Test-c-full.py b/testenv/Test-c-full.py
index 52574d61..87ffc529 100755
--- a/testenv/Test-c-full.py
+++ b/testenv/Test-c-full.py
@@ -20,9 +20,9 @@ D_File = WgetFile ("File2", File2)
 E_File = WgetFile ("File3", File1)
 
 WGET_OPTIONS = "-d -c"
-WGET_URLS = ["File1", "File2", "File3"]
+WGET_URLS = [["File1", "File2", "File3"]]
 
-Files = [A_File, C_File, E_File]
+Files = [[A_File, C_File, E_File]]
 Existing_Files = [B_File, D_File]
 
 ExpectedReturnCode = 0
diff --git a/testenv/Test-cookie-401.py b/testenv/Test-cookie-401.py
index c4bf64d3..9ca96415 100755
--- a/testenv/Test-cookie-401.py
+++ b/testenv/Test-cookie-401.py
@@ -28,9 +28,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 6
 ExpectedDownloadedFiles = [B_File]
diff --git a/testenv/Test-cookie-domain-mismatch.py b/testenv/Test-cookie-domain-mismatch.py
index 8b32dccd..ae108d99 100755
--- a/testenv/Test-cookie-domain-mismatch.py
+++ b/testenv/Test-cookie-domain-mismatch.py
@@ -26,9 +26,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File]
diff --git a/testenv/Test-cookie-expires.py b/testenv/Test-cookie-expires.py
index fb022511..2ae3bf90 100755
--- a/testenv/Test-cookie-expires.py
+++ b/testenv/Test-cookie-expires.py
@@ -49,9 +49,9 @@ C_File = WgetFile ("File3", File3, rules=File3_rules)
 D_File = WgetFile ("File4", File4, rules=File4_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2", "File3", "File4"]
+WGET_URLS = [["File1", "File2", "File3", "File4"]]
 
-Files = [A_File, B_File, C_File, D_File]
+Files = [[A_File, B_File, C_File, D_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File, C_File, D_File]
diff --git a/testenv/Test-cookie.py b/testenv/Test-cookie.py
index 4ee86ea5..7f5b0932 100755
--- a/testenv/Test-cookie.py
+++ b/testenv/Test-cookie.py
@@ -26,9 +26,9 @@ A_File = WgetFile ("File1", File1, rules=File1_rules)
 B_File = WgetFile ("File2", File2, rules=File2_rules)
 
 WGET_OPTIONS = "-d"
-WGET_URLS = ["File1", "File2"]
+WGET_URLS = [["File1", "File2"]]
 
-Files = [A_File, B_File]
+Files = [[A_File, B_File]]
 
 ExpectedReturnCode = 0
 ExpectedDownloadedFiles = [A_File, B_File]