diff --git a/benchmarks_test.go b/benchmarks_test.go
index 9761a26c..d3aaf04f 100644
--- a/benchmarks_test.go
+++ b/benchmarks_test.go
@@ -19,8 +19,8 @@ import (
 
 	bitswap "github.com/ipfs/go-bitswap"
 	bssession "github.com/ipfs/go-bitswap/internal/session"
-	testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
-	tn "github.com/ipfs/go-bitswap/internal/testnet"
+	testinstance "github.com/ipfs/go-bitswap/testinstance"
+	tn "github.com/ipfs/go-bitswap/testnet"
 	bsnet "github.com/ipfs/go-bitswap/network"
 	cid "github.com/ipfs/go-cid"
 	delay "github.com/ipfs/go-ipfs-delay"
diff --git a/bitswap_test.go b/bitswap_test.go
index 428fa5be..ba89e038 100644
--- a/bitswap_test.go
+++ b/bitswap_test.go
@@ -11,8 +11,8 @@ import (
 	bitswap "github.com/ipfs/go-bitswap"
 	decision "github.com/ipfs/go-bitswap/internal/decision"
 	bssession "github.com/ipfs/go-bitswap/internal/session"
-	testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
-	tn "github.com/ipfs/go-bitswap/internal/testnet"
+	testinstance "github.com/ipfs/go-bitswap/testinstance"
+	tn "github.com/ipfs/go-bitswap/testnet"
 	"github.com/ipfs/go-bitswap/message"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
diff --git a/bitswap_with_sessions_test.go b/bitswap_with_sessions_test.go
index 3b5b68e1..9551938c 100644
--- a/bitswap_with_sessions_test.go
+++ b/bitswap_with_sessions_test.go
@@ -8,7 +8,7 @@ import (
 
 	bitswap "github.com/ipfs/go-bitswap"
 	bssession "github.com/ipfs/go-bitswap/internal/session"
-	testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
+	testinstance "github.com/ipfs/go-bitswap/testinstance"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
diff --git a/network/ipfs_impl_test.go b/network/ipfs_impl_test.go
index e5b2475f..5e0f512b 100644
--- a/network/ipfs_impl_test.go
+++ b/network/ipfs_impl_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	tn "github.com/ipfs/go-bitswap/internal/testnet"
+	tn "github.com/ipfs/go-bitswap/testnet"
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	pb "github.com/ipfs/go-bitswap/message/pb"
 	bsnet "github.com/ipfs/go-bitswap/network"
diff --git a/internal/testinstance/testinstance.go b/testinstance/testinstance.go
similarity index 98%
rename from internal/testinstance/testinstance.go
rename to testinstance/testinstance.go
index b1651db1..2ee6be8b 100644
--- a/internal/testinstance/testinstance.go
+++ b/testinstance/testinstance.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	bitswap "github.com/ipfs/go-bitswap"
-	tn "github.com/ipfs/go-bitswap/internal/testnet"
+	tn "github.com/ipfs/go-bitswap/testnet"
 	bsnet "github.com/ipfs/go-bitswap/network"
 	ds "github.com/ipfs/go-datastore"
 	delayed "github.com/ipfs/go-datastore/delayed"
diff --git a/internal/testnet/interface.go b/testnet/interface.go
similarity index 100%
rename from internal/testnet/interface.go
rename to testnet/interface.go
diff --git a/internal/testnet/internet_latency_delay_generator.go b/testnet/internet_latency_delay_generator.go
similarity index 100%
rename from internal/testnet/internet_latency_delay_generator.go
rename to testnet/internet_latency_delay_generator.go
diff --git a/internal/testnet/internet_latency_delay_generator_test.go b/testnet/internet_latency_delay_generator_test.go
similarity index 100%
rename from internal/testnet/internet_latency_delay_generator_test.go
rename to testnet/internet_latency_delay_generator_test.go
diff --git a/internal/testnet/network_test.go b/testnet/network_test.go
similarity index 100%
rename from internal/testnet/network_test.go
rename to testnet/network_test.go
diff --git a/internal/testnet/peernet.go b/testnet/peernet.go
similarity index 100%
rename from internal/testnet/peernet.go
rename to testnet/peernet.go
diff --git a/internal/testnet/rate_limit_generators.go b/testnet/rate_limit_generators.go
similarity index 100%
rename from internal/testnet/rate_limit_generators.go
rename to testnet/rate_limit_generators.go
diff --git a/internal/testnet/virtual.go b/testnet/virtual.go
similarity index 100%
rename from internal/testnet/virtual.go
rename to testnet/virtual.go