diff --git a/uplink/metainfo/kvmetainfo/buckets_test.go b/private/testuplink/buckets_test.go
similarity index 99%
rename from uplink/metainfo/kvmetainfo/buckets_test.go
rename to private/testuplink/buckets_test.go
index 672db7d0e..32950e30a 100644
--- a/uplink/metainfo/kvmetainfo/buckets_test.go
+++ b/private/testuplink/buckets_test.go
@@ -1,7 +1,7 @@
 // Copyright (C) 2019 Storj Labs, Inc.
 // See LICENSE for copying information.
 
-package kvmetainfo_test
+package testuplink_test
 
 import (
 	"context"
diff --git a/uplink/ecclient/client_planet_test.go b/private/testuplink/client_planet_test.go
similarity index 98%
rename from uplink/ecclient/client_planet_test.go
rename to private/testuplink/client_planet_test.go
index f0677ef16..77afbd7cc 100644
--- a/uplink/ecclient/client_planet_test.go
+++ b/private/testuplink/client_planet_test.go
@@ -1,7 +1,7 @@
-// Copyright (C) 2019 Storj Labs, Inc.
+// Copyright (C) 2020 Storj Labs, Inc.
 // See LICENSE for copying information.
 
-package ecclient_test
+package testuplink_test
 
 import (
 	"bytes"
diff --git a/private/testuplink/doc.go b/private/testuplink/doc.go
new file mode 100644
index 000000000..ac07ab308
--- /dev/null
+++ b/private/testuplink/doc.go
@@ -0,0 +1,5 @@
+// Copyright (C) 2020 Storj Labs, Inc.
+// See LICENSE for copying information.
+
+// Package testuplink contains integration tests for storj.io/uplink
+package testuplink
diff --git a/uplink/metainfo/kvmetainfo/objects_test.go b/private/testuplink/objects_test.go
similarity index 99%
rename from uplink/metainfo/kvmetainfo/objects_test.go
rename to private/testuplink/objects_test.go
index d3a892a3a..4d391789c 100644
--- a/uplink/metainfo/kvmetainfo/objects_test.go
+++ b/private/testuplink/objects_test.go
@@ -1,7 +1,7 @@
 // Copyright (C) 2019 Storj Labs, Inc.
 // See LICENSE for copying information.
 
-package kvmetainfo_test
+package testuplink_test
 
 import (
 	"context"
diff --git a/uplink/ecclient/client_test.go b/uplink/ecclient/client_test.go
index 2b9de7d5c..b523ca223 100644
--- a/uplink/ecclient/client_test.go
+++ b/uplink/ecclient/client_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"storj.io/common/pb"
-	"storj.io/storj/private/teststorj"
+	"storj.io/common/testrand"
 )
 
 func TestUnique(t *testing.T) {
@@ -18,7 +18,7 @@ func TestUnique(t *testing.T) {
 	for i := 0; i < len(limits); i++ {
 		limits[i] = &pb.AddressedOrderLimit{
 			Limit: &pb.OrderLimit{
-				StorageNodeId: teststorj.NodeIDFromString(fmt.Sprintf("node-%d", i)),
+				StorageNodeId: testrand.NodeID(),
 			},
 		}
 	}