diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponseEncodeDecodeTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponseEncodeDecodeTest.java
index fd18175dd4d5b..91a1751202845 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponseEncodeDecodeTest.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponseEncodeDecodeTest.java
@@ -40,7 +40,7 @@ public void shouldEncodeAndDecodePullRequestMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         StoreCopyFinishedResponse received = (StoreCopyFinishedResponse) channel.readInbound();
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestEncodeDecodeTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestEncodeDecodeTest.java
index 6ff68c5388d6f..d46073afc0fa4 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestEncodeDecodeTest.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestEncodeDecodeTest.java
@@ -39,7 +39,7 @@ public void shouldEncodeAndDecodePullRequestMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         TxPullRequest received = (TxPullRequest) channel.readInbound();
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java
index 4ba9af4560473..da5f1287258d7 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java
@@ -47,7 +47,7 @@ public void shouldEncodeAndDecodePullResponseMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         TxPullResponse received = (TxPullResponse) channel.readInbound();
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponseEncodeDecodeTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponseEncodeDecodeTest.java
index 9168ffe73b547..2e6a0df5ac25a 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponseEncodeDecodeTest.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxStreamFinishedResponseEncodeDecodeTest.java
@@ -38,7 +38,7 @@ public void shouldEncodeAndDecodePullRequestMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         TxStreamFinishedResponse received = (TxStreamFinishedResponse) channel.readInbound();
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java
index 2b19c68459939..a62508f5464c3 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java
@@ -31,12 +31,12 @@
 import org.neo4j.causalclustering.core.consensus.RaftMessages;
 import org.neo4j.causalclustering.core.consensus.ReplicatedInteger;
 import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry;
-import org.neo4j.causalclustering.messaging.marshalling.RaftMessageDecoder;
-import org.neo4j.causalclustering.messaging.marshalling.RaftMessageEncoder;
 import org.neo4j.causalclustering.core.replication.ReplicatedContent;
-import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal;
 import org.neo4j.causalclustering.core.state.storage.SafeChannelMarshal;
 import org.neo4j.causalclustering.identity.MemberId;
+import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal;
+import org.neo4j.causalclustering.messaging.marshalling.RaftMessageDecoder;
+import org.neo4j.causalclustering.messaging.marshalling.RaftMessageEncoder;
 import org.neo4j.storageengine.api.ReadPastEndException;
 import org.neo4j.storageengine.api.ReadableChannel;
 import org.neo4j.storageengine.api.WritableChannel;
@@ -106,7 +106,7 @@ public void shouldEncodeAndDecodeVoteRequest()
 
         // when
         channel.writeOutbound( request );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         assertEquals( request, channel.readInbound() );
@@ -121,7 +121,7 @@ public void shouldEncodeAndDecodeVoteResponse()
 
         // when
         channel.writeOutbound( response );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         assertEquals( response, channel.readInbound() );
@@ -138,7 +138,7 @@ public void shouldEncodeAndDecodeAppendEntriesRequest()
 
         // when
         channel.writeOutbound( request );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         assertEquals( request, channel.readInbound() );
@@ -154,7 +154,7 @@ public void shouldEncodeAndDecodeAppendEntriesResponse()
 
         // when
         channel.writeOutbound( response );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         assertEquals( response, channel.readInbound() );
@@ -170,7 +170,7 @@ public void shouldEncodeAndDecodeNewEntryRequest()
 
         // when
         channel.writeOutbound( request );
-        channel.writeInbound( channel.readOutbound() );
+        channel.writeInbound( new Object[]{channel.readOutbound()} );
 
         // then
         assertEquals( request, channel.readInbound() );
diff --git a/pom.xml b/pom.xml
index de3945812b3a2..9cce692217fb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,7 +499,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
-        <version>4.0.40.Final</version>
+        <version>4.1.6.Final</version>
       </dependency>
 
       <dependency>