4 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index 0aa4aacf16..9becde110b 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -92,7 +92,7 @@
     "sasl-2.4.2",
     "snmp-5.1.2",
     "ssh-4.0",
-    "stdlib-3.4",
+    "stdlib-3.5",
     "syntax_tools-1.7",
     "tools-2.8",
     "xmerl-1.3.8"
diff --git a/lib/common_test/src/ct_webtool.erl b/lib/common_test/src/ct_webtool.erl
index 82aa78fc4b..c7174b13f5 100644
--- a/lib/common_test/src/ct_webtool.erl
+++ b/lib/common_test/src/ct_webtool.erl
@@ -771,7 +771,7 @@ fill_out(Nr)->
 %Controls whether the user selected a tool to start
 %----------------------------------------------------------------------
 get_tools(Input)->
-    case httpd:parse_query(Input) of
+    case uri_string:dissect_query(Input) of
 	[]->
 	    no_tools;
 	 Tools->
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 3a454a1e84..a76c8c12de 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -5739,7 +5739,7 @@ uri_encode_comp([Char|Chars],Encoding) ->
     Reserved = sets:is_element(Char, reserved()),
     case (Char>127 andalso Encoding==latin1) orelse Reserved of
 	true ->
-	    [ $% | http_util:integer_to_hexlist(Char)] ++
+	    [ $% | integer_to_list(Char, 16)] ++
 		uri_encode_comp(Chars,Encoding);
 	false ->
 	    [Char | uri_encode_comp(Chars,Encoding)]
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index 83fcde2f48..2bf3e82ade 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -919,7 +919,7 @@ get_input_data(Input,Key)->
     end.
 
 parse(Input) ->
-    httpd:parse_query(Input).
+    uri_string:dissect_query(Input).
 
 vts_integer_to_list(X) when is_atom(X) ->
     atom_to_list(X);