diff --git a/common/net/testing/unit/address_test.go b/common/net/address_test.go
similarity index 99%
rename from common/net/testing/unit/address_test.go
rename to common/net/address_test.go
index 7a7f566a..611024fc 100644
--- a/common/net/testing/unit/address_test.go
+++ b/common/net/address_test.go
@@ -1,4 +1,4 @@
-package unit
+package net_test
 
 import (
 	"net"
diff --git a/common/net/testing/unit/destination_test.go b/common/net/destination_test.go
similarity index 97%
rename from common/net/testing/unit/destination_test.go
rename to common/net/destination_test.go
index badffaf6..391ebe5c 100644
--- a/common/net/testing/unit/destination_test.go
+++ b/common/net/destination_test.go
@@ -1,4 +1,4 @@
-package unit
+package net_test
 
 import (
 	"testing"
diff --git a/common/net/testing/unit/unit.go b/common/net/testing/unit/unit.go
deleted file mode 100644
index 45dbef42..00000000
--- a/common/net/testing/unit/unit.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package unit
-
-// Placeholder. Golang doesn't like folders full of test files.
diff --git a/common/net/testing/unit/transport_test.go b/common/net/transport_test.go
similarity index 99%
rename from common/net/testing/unit/transport_test.go
rename to common/net/transport_test.go
index f0d65060..4df1db02 100644
--- a/common/net/testing/unit/transport_test.go
+++ b/common/net/transport_test.go
@@ -1,4 +1,4 @@
-package unit
+package net_test
 
 import (
 	"bytes"