diff --git a/eth.nimble b/eth.nimble
index fce46c2..296b3cd 100644
--- a/eth.nimble
+++ b/eth.nimble
@@ -50,6 +50,7 @@ proc runP2pTests() =
       "test_enode",
       "test_rlpx_thunk",
       "test_shh",
+      "test_shh_config",
       "test_shh_connect",
       "test_protocol_handlers",
     ]:
diff --git a/tests/p2p/test_shh.nim b/tests/p2p/test_shh.nim
index 25aac94..c3e7ba8 100644
--- a/tests/p2p/test_shh.nim
+++ b/tests/p2p/test_shh.nim
@@ -8,10 +8,8 @@
 #            MIT license (LICENSE-MIT)
 
 import
-  sequtils, options, unittest, times, tables,
-  nimcrypto/hash,
-  eth/[keys, rlp],
-  eth/p2p/rlpx_protocols/whisper_protocol as whisper
+  sequtils, options, unittest, tables, nimcrypto/hash,
+  eth/[keys, rlp], eth/p2p/rlpx_protocols/whisper/whisper_types as whisper
 
 suite "Whisper payload":
   test "should roundtrip without keys":
@@ -225,63 +223,6 @@ suite "Whisper envelope":
     check hashAndPoW(env) == ("00E2374C6353C243E4073E209A7F2ACB2506522AF318B3B78CF9A88310A2A11C",
                               19.692307692307693)
 
-  test "should validate and allow envelope according to config":
-    let ttl = 1'u32
-    let topic = [byte 1, 2, 3, 4]
-    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
-                               isLightNode: false, maxMsgSize: defaultMaxMsgSize)
-
-    let env = Envelope(expiry:epochTime().uint32 + ttl, ttl: ttl, topic: topic,
-                       data: repeat(byte 9, 256), nonce: 0)
-    check env.valid()
-
-    let msg = initMessage(env)
-    check msg.allowed(config)
-
-  test "should invalidate envelope due to ttl 0":
-    let ttl = 0'u32
-    let topic = [byte 1, 2, 3, 4]
-    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
-                               isLightNode: false, maxMsgSize: defaultMaxMsgSize)
-
-    let env = Envelope(expiry:epochTime().uint32 + ttl, ttl: ttl, topic: topic,
-                       data: repeat(byte 9, 256), nonce: 0)
-    check env.valid() == false
-
-  test "should invalidate envelope due to expired":
-    let ttl = 1'u32
-    let topic = [byte 1, 2, 3, 4]
-    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
-                               isLightNode: false, maxMsgSize: defaultMaxMsgSize)
-
-    let env = Envelope(expiry:epochTime().uint32, ttl: ttl, topic: topic,
-                       data: repeat(byte 9, 256), nonce: 0)
-    check env.valid() == false
-
-  test "should invalidate envelope due to in the future":
-    let ttl = 1'u32
-    let topic = [byte 1, 2, 3, 4]
-    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
-                               isLightNode: false, maxMsgSize: defaultMaxMsgSize)
-
-    # there is currently a 2 second tolerance, hence the + 3
-    let env = Envelope(expiry:epochTime().uint32 + ttl + 3, ttl: ttl, topic: topic,
-                       data: repeat(byte 9, 256), nonce: 0)
-    check env.valid() == false
-
-  test "should not allow envelope due to bloom filter":
-    let topic = [byte 1, 2, 3, 4]
-    let wrongTopic = [byte 9, 8, 7, 6]
-    let config = WhisperConfig(powRequirement: 0, bloom: wrongTopic.topicBloom(),
-                               isLightNode: false, maxMsgSize: defaultMaxMsgSize)
-
-    let env = Envelope(expiry:100000 , ttl: 30, topic: topic,
-                       data: repeat(byte 9, 256), nonce: 0)
-
-    let msg = initMessage(env)
-    check msg.allowed(config) == false
-
-
 suite "Whisper queue":
   test "should throw out lower proof-of-work item when full":
     var queue = initQueue(1)
diff --git a/tests/p2p/test_shh_config.nim b/tests/p2p/test_shh_config.nim
new file mode 100644
index 0000000..01ac113
--- /dev/null
+++ b/tests/p2p/test_shh_config.nim
@@ -0,0 +1,69 @@
+#
+#                 Ethereum P2P
+#              (c) Copyright 2018
+#       Status Research & Development GmbH
+#
+#            Licensed under either of
+#  Apache License, version 2.0, (LICENSE-APACHEv2)
+#            MIT license (LICENSE-MIT)
+
+import
+  sequtils, options, unittest, times,
+  eth/p2p/rlpx_protocols/whisper_protocol as whisper
+
+suite "Whisper envelope validation":
+  test "should validate and allow envelope according to config":
+    let ttl = 1'u32
+    let topic = [byte 1, 2, 3, 4]
+    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
+                                isLightNode: false, maxMsgSize: defaultMaxMsgSize)
+
+    let env = Envelope(expiry:epochTime().uint32 + ttl, ttl: ttl, topic: topic,
+                        data: repeat(byte 9, 256), nonce: 0)
+    check env.valid()
+
+    let msg = initMessage(env)
+    check msg.allowed(config)
+
+  test "should invalidate envelope due to ttl 0":
+    let ttl = 0'u32
+    let topic = [byte 1, 2, 3, 4]
+    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
+                                isLightNode: false, maxMsgSize: defaultMaxMsgSize)
+
+    let env = Envelope(expiry:epochTime().uint32 + ttl, ttl: ttl, topic: topic,
+                        data: repeat(byte 9, 256), nonce: 0)
+    check env.valid() == false
+
+  test "should invalidate envelope due to expired":
+    let ttl = 1'u32
+    let topic = [byte 1, 2, 3, 4]
+    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
+                                isLightNode: false, maxMsgSize: defaultMaxMsgSize)
+
+    let env = Envelope(expiry:epochTime().uint32, ttl: ttl, topic: topic,
+                        data: repeat(byte 9, 256), nonce: 0)
+    check env.valid() == false
+
+  test "should invalidate envelope due to in the future":
+    let ttl = 1'u32
+    let topic = [byte 1, 2, 3, 4]
+    let config = WhisperConfig(powRequirement: 0, bloom: topic.topicBloom(),
+                                isLightNode: false, maxMsgSize: defaultMaxMsgSize)
+
+    # there is currently a 2 second tolerance, hence the + 3
+    let env = Envelope(expiry:epochTime().uint32 + ttl + 3, ttl: ttl, topic: topic,
+                        data: repeat(byte 9, 256), nonce: 0)
+    check env.valid() == false
+
+  test "should not allow envelope due to bloom filter":
+    let topic = [byte 1, 2, 3, 4]
+    let wrongTopic = [byte 9, 8, 7, 6]
+    let config = WhisperConfig(powRequirement: 0, bloom: wrongTopic.topicBloom(),
+                                isLightNode: false, maxMsgSize: defaultMaxMsgSize)
+
+    let env = Envelope(expiry:100000 , ttl: 30, topic: topic,
+                        data: repeat(byte 9, 256), nonce: 0)
+
+    let msg = initMessage(env)
+    check msg.allowed(config) == false