diff --git a/Tests/CodexTests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs b/Tests/CodexTests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs
index ed66240..567c611 100644
--- a/Tests/CodexTests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs
+++ b/Tests/CodexTests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs
@@ -1,4 +1,6 @@
-using NUnit.Framework;
+using CodexContractsPlugin;
+using GethPlugin;
+using NUnit.Framework;
 using Utils;
 
 namespace Tests.DownloadConnectivityTests
@@ -17,7 +19,9 @@ namespace Tests.DownloadConnectivityTests
         [Test]
         public void MarketplaceDoesNotInterfereWithPeerDownload()
         {
-            //AddCodex(2, s => s.EnableMetrics().EnableMarketplace(1000.TestTokens()));
+            var geth = Ci.StartGethNode(s => s.IsMiner());
+            var contracts = Ci.StartCodexContracts(geth);
+            AddCodex(2, s => s.EnableMarketplace(geth, contracts, 10.Eth(), 1000.TestTokens()));
 
             AssertAllNodesConnected();
         }
diff --git a/Tests/CodexTests/PeerDiscoveryTests/PeerDiscoveryTests.cs b/Tests/CodexTests/PeerDiscoveryTests/PeerDiscoveryTests.cs
index 4141925..9327e7b 100644
--- a/Tests/CodexTests/PeerDiscoveryTests/PeerDiscoveryTests.cs
+++ b/Tests/CodexTests/PeerDiscoveryTests/PeerDiscoveryTests.cs
@@ -1,4 +1,6 @@
-using NUnit.Framework;
+using CodexContractsPlugin;
+using GethPlugin;
+using NUnit.Framework;
 
 namespace Tests.PeerDiscoveryTests
 {
@@ -26,7 +28,9 @@ namespace Tests.PeerDiscoveryTests
         [Test]
         public void MarketplaceDoesNotInterfereWithPeerDiscovery()
         {
-            //AddCodex(2, s => s.EnableMarketplace(1000.TestTokens()));
+            var geth = Ci.StartGethNode(s => s.IsMiner());
+            var contracts = Ci.StartCodexContracts(geth);
+            AddCodex(2, s => s.EnableMarketplace(geth, contracts, 10.Eth(), 1000.TestTokens()));
 
             AssertAllNodesConnected();
         }