diff --git a/driver-testsuite/web-fixtures/advanced_form_post.php b/driver-testsuite/web-fixtures/advanced_form_post.php
index 755806dc6..dda1ee383 100644
--- a/driver-testsuite/web-fixtures/advanced_form_post.php
+++ b/driver-testsuite/web-fixtures/advanced_form_post.php
@@ -14,10 +14,13 @@
 
 $_POST['agreement'] = isset($_POST['agreement']) ? 'on' : 'off';
 ksort($_POST);
-echo str_replace('>', '', var_export($_POST, true)) . "\n";
+foreach ($_POST as $key => $value) {
+	$post_for_printing[htmlspecialchars($key, ENT_QUOTES, 'UTF-8')] = htmlspecialchars(var_export($value, TRUE), ENT_QUOTES, 'UTF-8');
+}
+echo str_replace('>', '', var_export($post_for_printing, true)) . "\n";
 if (isset($_FILES['about']) && file_exists($_FILES['about']['tmp_name'])) {
-    echo $_FILES['about']['name'] . "\n";
-    echo file_get_contents($_FILES['about']['tmp_name']);
+    echo htmlspecialchars($_FILES['about']['name'], ENT_QUOTES, 'UTF-8') . "\n";
+    echo htmlspecialchars(file_get_contents($_FILES['about']['tmp_name'], ENT_QUOTES, 'UTF-8'));
 } else {
     echo "no file";
 }
diff --git a/driver-testsuite/web-fixtures/basic_form_post.php b/driver-testsuite/web-fixtures/basic_form_post.php
index 8a5e340ef..751b27684 100644
--- a/driver-testsuite/web-fixtures/basic_form_post.php
+++ b/driver-testsuite/web-fixtures/basic_form_post.php
@@ -5,9 +5,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 </head>
 <body>
-    <h1>Anket for <?php echo $_POST['first_name'] ?></h1>
-
-    <span id="first">Firstname: <?php echo $_POST['first_name'] ?></span>
-    <span id="last">Lastname: <?php echo $_POST['last_name'] ?></span>
+    <h1>Anket for <?php echo htmlspecialchars($_POST['first_name'], ENT_QUOTES, 'UTF-8') ?></h1>
+    <span id="first">Firstname: <?php echo htmlspecialchars($_POST['first_name'], ENT_QUOTES, 'UTF-8') ?></span>
+    <span id="last">Lastname: <?php echo htmlspecialchars($_POST['last_name'], ENT_QUOTES, 'UTF-8') ?></span>
 </body>
 </html>
diff --git a/driver-testsuite/web-fixtures/basic_get_form.php b/driver-testsuite/web-fixtures/basic_get_form.php
index a0b35166e..a84a2f83c 100644
--- a/driver-testsuite/web-fixtures/basic_get_form.php
+++ b/driver-testsuite/web-fixtures/basic_get_form.php
@@ -8,7 +8,7 @@
     <h1>Basic Get Form Page</h1>
 
     <div id="serach">
-        <?php echo isset($_GET['q']) && $_GET['q'] ? $_GET['q'] : 'No search query' ?>
+        <?php echo isset($_GET['q']) && $_GET['q'] ? htmlspecialchars($_GET['q'], ENT_QUOTES, 'UTF-8') : 'No search query' ?>
     </div>
 
     <form>
diff --git a/driver-testsuite/web-fixtures/cookie_page2.php b/driver-testsuite/web-fixtures/cookie_page2.php
index 22bcd1be1..97e5297e8 100644
--- a/driver-testsuite/web-fixtures/cookie_page2.php
+++ b/driver-testsuite/web-fixtures/cookie_page2.php
@@ -5,6 +5,6 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 </head>
 <body>
-    Previous cookie: <?php echo isset($_COOKIE['srvr_cookie']) ? $_COOKIE['srvr_cookie'] : 'NO'; ?>
+    Previous cookie: <?php echo isset($_COOKIE['srvr_cookie']) ? htmlspecialchars($_COOKIE['srvr_cookie'], ENT_QUOTES, 'UTF-8') : 'NO'; ?>
 </body>
 </html>
diff --git a/driver-testsuite/web-fixtures/issue130.php b/driver-testsuite/web-fixtures/issue130.php
index 201d9826e..e19551ea4 100644
--- a/driver-testsuite/web-fixtures/issue130.php
+++ b/driver-testsuite/web-fixtures/issue130.php
@@ -5,7 +5,7 @@
     if ('1' === $_GET['p']) {
         echo '<a href="issue130.php?p=2">Go to 2</a>';
     } else {
-        echo '<strong>'.$_SERVER['HTTP_REFERER'].'</strong>';
+        echo '<strong>'.htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, 'UTF-8').'</strong>';
     }
     ?>
 </body>
diff --git a/driver-testsuite/web-fixtures/issue140.php b/driver-testsuite/web-fixtures/issue140.php
index 04a4cafb7..b98bbdfeb 100644
--- a/driver-testsuite/web-fixtures/issue140.php
+++ b/driver-testsuite/web-fixtures/issue140.php
@@ -2,7 +2,7 @@
 if (!empty($_POST)) {
     setcookie("tc", $_POST['cookie_value'], null, '/');
 } elseif (isset($_GET["show_value"])) {
-    echo $_COOKIE["tc"];
+    echo htmlspecialchars($_COOKIE["tc"],  ENT_QUOTES, 'UTF-8');
     die();
 }
 ?>
diff --git a/driver-testsuite/web-fixtures/print_cookies.php b/driver-testsuite/web-fixtures/print_cookies.php
index eef496ec5..3aea17973 100644
--- a/driver-testsuite/web-fixtures/print_cookies.php
+++ b/driver-testsuite/web-fixtures/print_cookies.php
@@ -5,6 +5,11 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 </head>
 <body>
-    <?php echo str_replace('>', '', var_export($_COOKIE, true)); ?>
+	<?php
+	foreach ($_COOKIE as $key => $value) {
+		$cookie_for_printing[htmlspecialchars($key, ENT_QUOTES, 'UTF-8')] = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+	}
+	?>
+    <?php echo str_replace('>', '', var_export($cookie_for_printing, true)); ?>
 </body>
 </html>
