diff --git a/Makefile b/Makefile
index 0203f87835..dc0519108b 100644
--- a/Makefile
+++ b/Makefile
@@ -32,16 +32,16 @@ e2e-compile:
 
 ## Run system tests
 e2e-test:
-	mvn -f system-tests/pom.xml -P$(PLATFORM) scalatest:test
+	mvn -f system-tests/e2e-suite/pom.xml -P$(PLATFORM) scalatest:test
 
 ## Execute a single end-to-end (scala) test
 # Alternatively, it should be possible to run an individual e2e test
 # with following Maven command:
 #
-#  mvn -f system-tests/pom.xml scalatest:test -Dsuites='*ProxyPropertySpec'
+#  mvn -f system-tests/e2e-suite/pom.xml scalatest:test -Dsuites='*ProxyPropertySpec'
 #
 e2e-test-single:
-	mvn -f system-tests/pom.xml scalatest:test -Dsuites='${TEST}'
+	mvn -f system-tests/e2e-suite/pom.xml scalatest:test -Dsuites='${TEST}'
 
 ## Compile, test and create styx.zip
 release: clean
diff --git a/components/proxy/src/main/java/com/hotels/styx/proxy/ProxyConnectorFactory.java b/components/proxy/src/main/java/com/hotels/styx/proxy/ProxyConnectorFactory.java
index fae932b688..3a108ed9cb 100644
--- a/components/proxy/src/main/java/com/hotels/styx/proxy/ProxyConnectorFactory.java
+++ b/components/proxy/src/main/java/com/hotels/styx/proxy/ProxyConnectorFactory.java
@@ -37,8 +37,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.group.DefaultChannelGroup;
-import io.netty.handler.codec.http.HttpRequestDecoder;
-import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslHandler;
@@ -143,11 +142,8 @@ public void configure(Channel channel, HttpHandler httpPipeline) {
                     .addLast("idle-handler", new IdleStateHandler(serverConfig.requestTimeoutMillis(), 0, serverConfig.keepAliveTimeoutMillis(), MILLISECONDS))
                     .addLast("channel-stats", channelStatsHandler)
 
-                    // Outbound
-                    .addLast("encoder", new HttpResponseEncoder())
-
-                    // Inbound
-                    .addLast("decoder", new HttpRequestDecoder(serverConfig.maxInitialLineLength(), serverConfig.maxHeaderSize(), serverConfig.maxChunkSize(), true))
+                    // Http Server Codec
+                    .addLast("http-server-codec", new HttpServerCodec(serverConfig.maxInitialLineLength(), serverConfig.maxHeaderSize(), serverConfig.maxChunkSize(), true))
 
                     // idle-handler and timeout-handler must be before aggregator. Otherwise
                     // timeout handler cannot see the incoming HTTP chunks.