diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
index e35a649c468..8f287c9fbea 100644
--- a/ouroboros-network/ouroboros-network.cabal
+++ b/ouroboros-network/ouroboros-network.cabal
@@ -200,12 +200,12 @@ library
     cpp-options: -DTXSUBMISSION_DELAY
 
 -- Simulation Test Library
-library sim-tests-lib
+library testlib
   import: ghc-options-tests
   default-language: Haskell2010
   default-extensions: ImportQualifiedPost
   visibility: public
-  hs-source-dirs: sim-tests-lib
+  hs-source-dirs: testlib
   build-depends:
     QuickCheck,
     aeson,
@@ -297,7 +297,7 @@ test-suite sim-tests
   main-is: Main.hs
   build-depends:
     base >=4.14 && <4.21,
-    ouroboros-network:sim-tests-lib,
+    ouroboros-network:testlib,
     ouroboros-network-protocols:testlib,
     tasty,
     with-utf8,
@@ -402,7 +402,7 @@ benchmark sim-benchmarks
   main-is: Main.hs
   build-depends:
     base,
-    ouroboros-network:sim-tests-lib,
+    ouroboros-network:testlib,
     tasty-bench >=0.3.5,
 
   ghc-options:
diff --git a/ouroboros-network/sim-tests-lib/Ouroboros/Network/BlockFetch/Examples.hs b/ouroboros-network/testlib/Ouroboros/Network/BlockFetch/Examples.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Ouroboros/Network/BlockFetch/Examples.hs
rename to ouroboros-network/testlib/Ouroboros/Network/BlockFetch/Examples.hs
diff --git a/ouroboros-network/sim-tests-lib/Ouroboros/Network/MockNode.hs b/ouroboros-network/testlib/Ouroboros/Network/MockNode.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Ouroboros/Network/MockNode.hs
rename to ouroboros-network/testlib/Ouroboros/Network/MockNode.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/BlockFetch.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/BlockFetch.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/BlockFetch.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/BlockFetch.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/ChainDB.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node/ChainDB.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/ChainDB.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node/ChainDB.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/Kernel.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node/Kernel.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/Kernel.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node/Kernel.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Policies.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Policies.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Policies.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Policies.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/KeepAlive.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/KeepAlive.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/KeepAlive.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/KeepAlive.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/LedgerPeers.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/LedgerPeers.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/LedgerPeers.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/LedgerPeers.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/MockNode.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/MockNode.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/MockNode.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/MockNode.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Mux.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Mux.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Mux.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Mux.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/NodeToClient/Version.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/NodeToClient/Version.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/NodeToClient/Version.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/NodeToClient/Version.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/NodeToNode/Version.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/NodeToNode/Version.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/NodeToNode/Version.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/NodeToNode/Version.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Orphans.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Orphans.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Orphans.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Orphans.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/Instances.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/Instances.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/Instances.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/Instances.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/LocalRootPeers.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/LocalRootPeers.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/LocalRootPeers.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/LocalRootPeers.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/PublicRootPeers.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/PublicRootPeers.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/PublicRootPeers.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Cardano/PublicRootPeers.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Instances.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Instances.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Json.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Json.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Json.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/Json.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/KnownPeers.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/KnownPeers.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/KnownPeers.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/KnownPeers.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/TxSubmission.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/TxSubmission.hs
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Version.hs b/ouroboros-network/testlib/Test/Ouroboros/Network/Version.hs
similarity index 100%
rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Version.hs
rename to ouroboros-network/testlib/Test/Ouroboros/Network/Version.hs