diff --git a/cmd/status/library.go b/cmd/status/library.go
index 030df9836..f14c19e36 100644
--- a/cmd/status/library.go
+++ b/cmd/status/library.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ethereum/go-ethereum/whisper"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv2"
 	"github.com/status-im/status-go/geth"
 	"github.com/status-im/status-go/jail"
 )
diff --git a/cmd/status/utils.go b/cmd/status/utils.go
index 7921dae08..44609cc07 100644
--- a/cmd/status/utils.go
+++ b/cmd/status/utils.go
@@ -22,10 +22,10 @@ import (
 const (
 	testDataDir         = "../../.ethereumtest"
 	testNodeSyncSeconds = 120
-	testAddress         = "0x89b50b2b26947ccad43accaef76c21d175ad85f4"
-	testAddressPassword = "asdf"
+	testAddress         = "0xadaf150b905cf5e6a778e553e15a139b6618bbb7"
+	testAddressPassword = "asdfasdf"
 	newAccountPassword  = "badpassword"
-	testAddress1        = "0xf82da7547534045b4e00442bc89e16186cf8c272"
+	testAddress1        = "0xadd4d1d02e71c7360c53296968e59d57fd15e2ba"
 	testStatusJsFile    = "../../jail/testdata/status.js"
 )
 
diff --git a/data/morden-test-account.pk b/data/morden-test-account.pk
new file mode 100644
index 000000000..7ea0a9af4
--- /dev/null
+++ b/data/morden-test-account.pk
@@ -0,0 +1 @@
+{"address":"89b50b2b26947ccad43accaef76c21d175ad85f4","crypto":{"cipher":"aes-128-ctr","ciphertext":"cc8f600a59f8c5ac3d6ab849722a6602f61de0adc5c9617a1cd014d3d9638a95","cipherparams":{"iv":"836bb6b5df64c29a84f95e7628510e71"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"4cc1f86eaa707ee37dc3b686712f09be49b7175a2046c63cfd1d7a3e7ebee8ab"},"mac":"164f2e53c67b5c85267b79e4fc8b2f9117a66b5e0546933403d85d52fffa1f52"},"id":"3ade037d-722b-467a-ad8e-2bcae28b9642","version":3,"whisperenabled":true}
diff --git a/data/test-account.pk b/data/test-account.pk
index 7ea0a9af4..20d5bf033 100644
--- a/data/test-account.pk
+++ b/data/test-account.pk
@@ -1 +1 @@
-{"address":"89b50b2b26947ccad43accaef76c21d175ad85f4","crypto":{"cipher":"aes-128-ctr","ciphertext":"cc8f600a59f8c5ac3d6ab849722a6602f61de0adc5c9617a1cd014d3d9638a95","cipherparams":{"iv":"836bb6b5df64c29a84f95e7628510e71"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"4cc1f86eaa707ee37dc3b686712f09be49b7175a2046c63cfd1d7a3e7ebee8ab"},"mac":"164f2e53c67b5c85267b79e4fc8b2f9117a66b5e0546933403d85d52fffa1f52"},"id":"3ade037d-722b-467a-ad8e-2bcae28b9642","version":3,"whisperenabled":true}
+{"address":"adaf150b905cf5e6a778e553e15a139b6618bbb7","crypto":{"cipher":"aes-128-ctr","ciphertext":"e6b4a87b62eca6b654b45ec806a19b5a8fa2ee1b39d2ca17406f11fb81428455","cipherparams":{"iv":"863515dcd60f8b9fec7d5ba59f2a895e"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"83e4d852dbd1d4bb93c1989736dd4cf4443b0842978a6eec3069a13406cb3605"},"mac":"7d00f96aeb1684717248fbcbdfec2d6da69dadea60e65239d20642e39097b923"},"id":"bc042f57-ad91-4459-a056-607ce80a760d","version":3,"whisperenabled":true,"extendedkey":{"cipher":"","ciphertext":"","cipherparams":{"iv":""},"kdf":"","kdfparams":null,"mac":""},"subaccountindex":0}
\ No newline at end of file
diff --git a/geth/node.go b/geth/node.go
index f5243b90b..1dcd090cd 100644
--- a/geth/node.go
+++ b/geth/node.go
@@ -27,7 +27,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/whisper"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv2"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -38,7 +38,8 @@ const (
 	versionPatch     = 0          // Patch version component of the current release
 	versionMeta      = "unstable" // Version metadata to append to the version string
 
-	RPCPort = 8545 // RPC port (replaced in unit tests)
+	RPCPort     = 8545 // RPC port (replaced in unit tests)
+	NetworkPort = 30303
 
 	EventNodeStarted = "node.started"
 )
@@ -126,6 +127,7 @@ func (m *NodeManager) MakeNode(datadir string, rpcport int) *node.Node {
 	set.String("rpcapi", "db,eth,net,web3,shh,personal,admin", "rpc api(s)")
 	set.String("datadir", datadir, "data directory for geth")
 	set.String("logdir", datadir, "log dir for glog")
+	set.Int("port", NetworkPort, "network listening port")
 	m.ctx = cli.NewContext(nil, set, nil)
 
 	utils.DebugSetup(m.ctx)
diff --git a/geth/node_test.go b/geth/node_test.go
index c25f71cb3..0568c39bb 100644
--- a/geth/node_test.go
+++ b/geth/node_test.go
@@ -10,10 +10,10 @@ import (
 )
 
 const (
-	testAddress         = "0x89b50b2b26947ccad43accaef76c21d175ad85f4"
-	testAddressPassword = "asdf"
+	testAddress         = "0xadaf150b905cf5e6a778e553e15a139b6618bbb7"
+	testAddressPassword = "asdfasdf"
 	newAccountPassword  = "badpassword"
-	testAddress1        = "0xf82da7547534045b4e00442bc89e16186cf8c272"
+	testAddress1        = "0xadd4d1d02e71c7360c53296968e59d57fd15e2ba"
 
 	whisperMessage1 = "test message 1 (K1 -> K1)"
 	whisperMessage2 = "test message 2 (K1 -> '')"
diff --git a/geth/whisper.go b/geth/whisper.go
index 4548108e2..19125e8da 100644
--- a/geth/whisper.go
+++ b/geth/whisper.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/whisper"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv2"
 )
 
 var (
diff --git a/geth/whisper_test.go b/geth/whisper_test.go
index 358735867..57aff0ad8 100644
--- a/geth/whisper_test.go
+++ b/geth/whisper_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/whisper"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv2"
 	"github.com/status-im/status-go/geth"
 )
 
diff --git a/jail/jail_test.go b/jail/jail_test.go
index 9c27a4dbc..69eafc9cd 100644
--- a/jail/jail_test.go
+++ b/jail/jail_test.go
@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	TEST_ADDRESS          = "0x89b50b2b26947ccad43accaef76c21d175ad85f4"
-	TEST_ADDRESS_PASSWORD = "asdf"
+	TEST_ADDRESS          = "0xadaf150b905cf5e6a778e553e15a139b6618bbb7"
+	TEST_ADDRESS_PASSWORD = "asdfasdf"
 	CHAT_ID_INIT          = "CHAT_ID_INIT_TEST"
 	CHAT_ID_CALL          = "CHAT_ID_CALL_TEST"
 	CHAT_ID_SEND          = "CHAT_ID_CALL_SEND"