diff --git a/dns_test.go b/dns_test.go
index 80ee83bb..b81bc7fc 100644
--- a/dns_test.go
+++ b/dns_test.go
@@ -1,8 +1,6 @@
 package headscale
 
 import (
-	"fmt"
-
 	"gopkg.in/check.v1"
 	"inet.af/netaddr"
 	"tailscale.com/tailcfg"
@@ -225,9 +223,6 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) {
 	}
 	app.db.Save(machine2InShared1)
 
-	err = app.AddSharedMachineToNamespace(machineInShared2, namespaceShared1)
-	c.Assert(err, check.IsNil)
-
 	baseDomain := "foobar.headscale.net"
 	dnsConfigOrig := tailcfg.DNSConfig{
 		Routes:  make(map[string][]dnstype.Resolver),
@@ -245,19 +240,21 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) {
 		peersOfMachineInShared1,
 	)
 	c.Assert(dnsConfig, check.NotNil)
-	c.Assert(len(dnsConfig.Routes), check.Equals, 2)
 
-	domainRouteShared1 := fmt.Sprintf("%s.%s", namespaceShared1.Name, baseDomain)
-	_, ok := dnsConfig.Routes[domainRouteShared1]
-	c.Assert(ok, check.Equals, true)
+	// TODO: Remove comment out when we have all nodes available to every node
+	// c.Assert(len(dnsConfig.Routes), check.Equals, 2)
 
-	domainRouteShared2 := fmt.Sprintf("%s.%s", namespaceShared2.Name, baseDomain)
-	_, ok = dnsConfig.Routes[domainRouteShared2]
-	c.Assert(ok, check.Equals, true)
-
-	domainRouteShared3 := fmt.Sprintf("%s.%s", namespaceShared3.Name, baseDomain)
-	_, ok = dnsConfig.Routes[domainRouteShared3]
-	c.Assert(ok, check.Equals, false)
+	// domainRouteShared1 := fmt.Sprintf("%s.%s", namespaceShared1.Name, baseDomain)
+	// _, ok := dnsConfig.Routes[domainRouteShared1]
+	// c.Assert(ok, check.Equals, true)
+	//
+	// domainRouteShared2 := fmt.Sprintf("%s.%s", namespaceShared2.Name, baseDomain)
+	// _, ok = dnsConfig.Routes[domainRouteShared2]
+	// c.Assert(ok, check.Equals, true)
+	//
+	// domainRouteShared3 := fmt.Sprintf("%s.%s", namespaceShared3.Name, baseDomain)
+	// _, ok = dnsConfig.Routes[domainRouteShared3]
+	// c.Assert(ok, check.Equals, false)
 }
 
 func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) {
@@ -374,9 +371,6 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) {
 	}
 	app.db.Save(machine2InShared1)
 
-	err = app.AddSharedMachineToNamespace(machineInShared2, namespaceShared1)
-	c.Assert(err, check.IsNil)
-
 	baseDomain := "foobar.headscale.net"
 	dnsConfigOrig := tailcfg.DNSConfig{
 		Routes:  make(map[string][]dnstype.Resolver),
diff --git a/namespaces_test.go b/namespaces_test.go
index d07deb96..f7b345bd 100644
--- a/namespaces_test.go
+++ b/namespaces_test.go
@@ -1,7 +1,6 @@
 package headscale
 
 import (
-	"github.com/rs/zerolog/log"
 	"gopkg.in/check.v1"
 	"gorm.io/gorm"
 	"inet.af/netaddr"
@@ -206,36 +205,35 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 	}
 	app.db.Save(machine2InShared1)
 
-	err = app.AddSharedMachineToNamespace(machineInShared2, namespaceShared1)
-	c.Assert(err, check.IsNil)
-	peersOfMachine1InShared1, err := app.getPeers(machineInShared1)
-	c.Assert(err, check.IsNil)
+	// TODO: Remove comment out when we have all nodes available to every node
+	// peersOfMachine1InShared1, err := app.getPeers(machineInShared1)
+	// c.Assert(err, check.IsNil)
 
-	userProfiles := getMapResponseUserProfiles(
-		*machineInShared1,
-		peersOfMachine1InShared1,
-	)
-
-	log.Trace().Msgf("userProfiles %#v", userProfiles)
-	c.Assert(len(userProfiles), check.Equals, 2)
-
-	found := false
-	for _, userProfiles := range userProfiles {
-		if userProfiles.DisplayName == namespaceShared1.Name {
-			found = true
-
-			break
-		}
-	}
-	c.Assert(found, check.Equals, true)
-
-	found = false
-	for _, userProfile := range userProfiles {
-		if userProfile.DisplayName == namespaceShared2.Name {
-			found = true
-
-			break
-		}
-	}
-	c.Assert(found, check.Equals, true)
+	// userProfiles := getMapResponseUserProfiles(
+	// 	*machineInShared1,
+	// 	peersOfMachine1InShared1,
+	// )
+	//
+	// log.Trace().Msgf("userProfiles %#v", userProfiles)
+	// c.Assert(len(userProfiles), check.Equals, 2)
+	//
+	// found := false
+	// for _, userProfiles := range userProfiles {
+	// 	if userProfiles.DisplayName == namespaceShared1.Name {
+	// 		found = true
+	//
+	// 		break
+	// 	}
+	// }
+	// c.Assert(found, check.Equals, true)
+	//
+	// found = false
+	// for _, userProfile := range userProfiles {
+	// 	if userProfile.DisplayName == namespaceShared2.Name {
+	// 		found = true
+	//
+	// 		break
+	// 	}
+	// }
+	// c.Assert(found, check.Equals, true)
 }