diff --git a/ethereumj-core/src/test/java/test/ethereum/net/wire/AdaptiveMessageIdsTest.java b/ethereumj-core/src/test/java/test/ethereum/net/wire/AdaptiveMessageIdsTest.java
index 00604f07..e4ba2177 100644
--- a/ethereumj-core/src/test/java/test/ethereum/net/wire/AdaptiveMessageIdsTest.java
+++ b/ethereumj-core/src/test/java/test/ethereum/net/wire/AdaptiveMessageIdsTest.java
@@ -8,6 +8,7 @@ import org.ethereum.net.p2p.P2pMessageCodes;
 import org.ethereum.net.shh.ShhHandler;
 import org.ethereum.net.shh.ShhMessageCodes;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,6 +27,12 @@ public class AdaptiveMessageIdsTest {
         EthMessageCodes.setOffset((byte) 0x00);
         ShhMessageCodes.setOffset((byte) 0x00);
     }
+    
+    @After
+    public void tearDown() {
+        EthMessageCodes.setOffset((byte) 0x00);
+        ShhMessageCodes.setOffset((byte) 0x00);
+    }
 
     @Test
     public void test1() {