diff --git a/Makefile b/Makefile
index d90075431a..7a39aa0ee8 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ test-unit-race:
 ## test-swamp: Running swamp tests located in nodebuilder/tests
 test-swamp:
 	@echo "--> Running swamp tests"
-	@go test ./nodebuilder/tests
+	@go test ./nodebuilder/tests --skip "TestHeaderSubscription|TestBlobModule|TestShrexNDFromLights|TestShrexNDFromLightsWithBadFulls|TestBridgeNodeAsBootstrapper|TestFullDiscoveryViaBootstrapper|TestFullReconstructFromFulls|TestFullReconstructFromLights|TestSyncAgainstBridge_NonEmptyChain|TestSyncAgainstBridge_EmptyChain|TestSyncStartStopLightWithBridge|TestSyncLightAgainstFull|TestSyncLightWithTrustedPeers"
 .PHONY: test-swamp
 
 ## test-swamp-race: Running swamp tests with data race detector located in node/tests
diff --git a/nodebuilder/tests/api_test.go b/nodebuilder/tests/api_test.go
index 290f027fb8..2fd4b2d3da 100644
--- a/nodebuilder/tests/api_test.go
+++ b/nodebuilder/tests/api_test.go
@@ -131,7 +131,6 @@ func TestBlobRPC(t *testing.T) {
 // TestHeaderSubscription ensures that the header subscription over RPC works
 // as intended and gets canceled successfully after rpc context cancellation.
 func TestHeaderSubscription(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)
 
@@ -168,6 +167,7 @@ func TestHeaderSubscription(t *testing.T) {
 	}
 	// cancel subscription via context
 	subcancel()
+
 	// stop the light node and expect no outstanding subscription errors
 	err = light.Stop(ctx)
 	require.NoError(t, err)
diff --git a/nodebuilder/tests/blob_test.go b/nodebuilder/tests/blob_test.go
index b8cdf58416..19fdfa0eb6 100644
--- a/nodebuilder/tests/blob_test.go
+++ b/nodebuilder/tests/blob_test.go
@@ -19,7 +19,6 @@ import (
 )
 
 func TestBlobModule(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), 25*time.Second)
 	t.Cleanup(cancel)
 	sw := swamp.NewSwamp(t, swamp.WithBlockTime(time.Second*1))
diff --git a/nodebuilder/tests/nd_test.go b/nodebuilder/tests/nd_test.go
index 8a96c7c6a6..8149ea9fe7 100644
--- a/nodebuilder/tests/nd_test.go
+++ b/nodebuilder/tests/nd_test.go
@@ -21,7 +21,6 @@ import (
 )
 
 func TestShrexNDFromLights(t *testing.T) {
-	t.Skip()
 	const (
 		blocks = 10
 		btime  = time.Millisecond * 300
@@ -79,7 +78,6 @@ func TestShrexNDFromLights(t *testing.T) {
 }
 
 func TestShrexNDFromLightsWithBadFulls(t *testing.T) {
-	t.Skip()
 	const (
 		blocks        = 10
 		btime         = time.Millisecond * 300
diff --git a/nodebuilder/tests/p2p_test.go b/nodebuilder/tests/p2p_test.go
index 8a1f1b34da..d05846f40c 100644
--- a/nodebuilder/tests/p2p_test.go
+++ b/nodebuilder/tests/p2p_test.go
@@ -26,7 +26,6 @@ Steps:
 5. Check that nodes are connected to bridge
 */
 func TestBridgeNodeAsBootstrapper(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)
 
@@ -66,7 +65,6 @@ Steps:
  7. Check that full and light nodes are connected to each other
 */
 func TestFullDiscoveryViaBootstrapper(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)
 
diff --git a/nodebuilder/tests/reconstruct_test.go b/nodebuilder/tests/reconstruct_test.go
index 881198ebe4..3c2e8b1f83 100644
--- a/nodebuilder/tests/reconstruct_test.go
+++ b/nodebuilder/tests/reconstruct_test.go
@@ -89,7 +89,6 @@ Test-Case: Full Node reconstructs blocks from each other, after unsuccessfully s
 block from LN subnetworks. Analog to TestShareAvailable_DisconnectedFullNodes.
 */
 func TestFullReconstructFromFulls(t *testing.T) {
-	t.Skip()
 	light.DefaultSampleAmount = 10 // s
 	const (
 		blocks = 10
@@ -256,7 +255,6 @@ Steps:
 9. Check that the FN can retrieve shares from 1 to 20 blocks
 */
 func TestFullReconstructFromLights(t *testing.T) {
-	t.Skip()
 	eds.RetrieveQuadrantTimeout = time.Millisecond * 100
 	light.DefaultSampleAmount = 20
 	const (
diff --git a/nodebuilder/tests/sync_test.go b/nodebuilder/tests/sync_test.go
index 866975faa8..25cadd1c8f 100644
--- a/nodebuilder/tests/sync_test.go
+++ b/nodebuilder/tests/sync_test.go
@@ -42,7 +42,6 @@ Full node:
 8. Wait for FN DASer to catch up to network head
 */
 func TestSyncAgainstBridge_NonEmptyChain(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)
 
@@ -136,7 +135,6 @@ Full node:
 8. Wait for FN DASer to catch up to network head
 */
 func TestSyncAgainstBridge_EmptyChain(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)
 
@@ -213,7 +211,6 @@ Steps:
 9. Check LN is synced to height 40
 */
 func TestSyncStartStopLightWithBridge(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	defer cancel()
 
@@ -283,7 +280,6 @@ Steps:
 10. Check LN is synced to network head
 */
 func TestSyncLightAgainstFull(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)
 
@@ -363,7 +359,6 @@ Steps:
 9. Check LN is synced to network head.
 */
 func TestSyncLightWithTrustedPeers(t *testing.T) {
-	t.Skip()
 	ctx, cancel := context.WithTimeout(context.Background(), swamp.DefaultTestTimeout)
 	t.Cleanup(cancel)