diff --git a/test/client_test.dart b/test/client_test.dart
index 6f09fab035..7db52bd49b 100644
--- a/test/client_test.dart
+++ b/test/client_test.dart
@@ -4,8 +4,6 @@
 
 import 'package:test/test.dart';
 
-import 'package:http/http.dart';
-
 import 'client.dart'
     if (dart.library.io) 'hybrid/client_io.dart'
     if (dart.library.html) 'hybrid/client_html.dart';
diff --git a/test/hybrid/server.dart b/test/hybrid/server.dart
index 3b54a8193a..65bd3e5dc5 100644
--- a/test/hybrid/server.dart
+++ b/test/hybrid/server.dart
@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:async/async.dart';
-import 'package:http/src/utils.dart';
+import 'package:http/src/content_type.dart';
 import "package:stream_channel/stream_channel.dart";
 
 /// The list of headers to ignore when sending back confirmation.
@@ -93,7 +93,7 @@ hybridMain(StreamChannel channel) async {
       var outputEncoding;
       var encodingName = request.uri.queryParameters['response-encoding'];
       if (encodingName != null) {
-        outputEncoding = requiredEncodingForCharset(encodingName);
+        outputEncoding = encodingForCharset(encodingName);
       } else {
         outputEncoding = ASCII;
       }
@@ -114,7 +114,7 @@ hybridMain(StreamChannel channel) async {
       } else if (request.headers.contentType != null &&
           request.headers.contentType.charset != null) {
         var encoding =
-            requiredEncodingForCharset(request.headers.contentType.charset);
+            encodingForCharset(request.headers.contentType.charset);
         requestBody = encoding.decode(requestBodyBytes);
       } else {
         requestBody = requestBodyBytes;