diff --git a/waku/nodes_basic_test.go b/waku/nodes_basic_test.go
index d21eea6..f486945 100644
--- a/waku/nodes_basic_test.go
+++ b/waku/nodes_basic_test.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/waku-org/waku-go-bindings/waku/common"
 )
 
 func TestBasicWakuNodes(t *testing.T) {
@@ -68,3 +69,59 @@ func TestNodeRestart(t *testing.T) {
 
 	Debug("TestNodeRestart completed successfully")
 }
+func TestDoubleStart(t *testing.T) {
+
+	tcpPort, udpPort, err := GetFreePortIfNeeded(0, 0)
+	require.NoError(t, err)
+
+	config := common.WakuConfig{
+		Relay:           true,
+		Store:           true,
+		LogLevel:        "DEBUG",
+		Discv5Discovery: true,
+		ClusterID:       16,
+		Shards:          []uint16{64},
+		Discv5UdpPort:   udpPort,
+		TcpPort:         tcpPort,
+	}
+
+	node, err := NewWakuNode(&config, "node")
+	require.NoError(t, err)
+	defer node.StopAndDestroy()
+
+	// start node
+	require.NoError(t, node.Start())
+	// now attempt to start again
+	require.NoError(t, node.Start())
+
+}
+
+func TestDoubleStop(t *testing.T) {
+
+	tcpPort, udpPort, err := GetFreePortIfNeeded(0, 0)
+	require.NoError(t, err)
+
+	config := common.WakuConfig{
+		Relay:           true,
+		Store:           true,
+		LogLevel:        "DEBUG",
+		Discv5Discovery: true,
+		ClusterID:       16,
+		Shards:          []uint16{64},
+		Discv5UdpPort:   udpPort,
+		TcpPort:         tcpPort,
+	}
+
+	node, err := NewWakuNode(&config, "node")
+	require.NoError(t, err)
+	defer node.StopAndDestroy()
+
+	// start node
+	require.NoError(t, node.Start())
+
+	// stop node
+	require.NoError(t, node.Stop())
+	// now attempt to stop it again
+	require.NoError(t, node.Stop())
+
+}