diff --git a/Tests/CodexReleaseTests/DataTests/DataExpiryTest.cs b/Tests/CodexReleaseTests/DataTests/DataExpiryTest.cs
new file mode 100644
index 00000000..263a9e8b
--- /dev/null
+++ b/Tests/CodexReleaseTests/DataTests/DataExpiryTest.cs
@@ -0,0 +1,95 @@
+using CodexContractsPlugin;
+using CodexTests;
+using NUnit.Framework;
+using Utils;
+
+namespace CodexReleaseTests.DataTests
+{
+    [TestFixture]
+    public class DataExpiryTest : CodexDistTest
+    {
+        [Test]
+        public void DeletesExpiredData()
+        {
+            var fileSize = 100.MB();
+            var blockTtl = TimeSpan.FromMinutes(1.0);
+            var interval = TimeSpan.FromSeconds(10.0);
+            var node = StartCodex(s => s
+                .WithBlockTTL(blockTtl)
+                .WithBlockMaintenanceInterval(interval)
+                .WithBlockMaintenanceNumber(100000)
+            );
+
+            var startSpace = node.Space();
+            Assert.That(startSpace.QuotaUsedBytes, Is.EqualTo(0));
+
+            node.UploadFile(GenerateTestFile(fileSize));
+            var usedSpace = node.Space();
+            var usedFiles = node.LocalFiles();
+            Assert.That(usedSpace.QuotaUsedBytes, Is.GreaterThanOrEqualTo(fileSize.SizeInBytes));
+            Assert.That(usedSpace.FreeBytes, Is.LessThanOrEqualTo(startSpace.FreeBytes - fileSize.SizeInBytes));
+            Assert.That(usedFiles.Content.Length, Is.EqualTo(1));
+
+            Thread.Sleep(blockTtl * 2);
+
+            var cleanupSpace = node.Space();
+            var cleanupFiles = node.LocalFiles();
+
+            Assert.That(cleanupSpace.QuotaUsedBytes, Is.LessThan(usedSpace.QuotaUsedBytes));
+            Assert.That(cleanupSpace.FreeBytes, Is.GreaterThan(usedSpace.FreeBytes));
+            Assert.That(cleanupFiles.Content.Length, Is.EqualTo(0));
+
+            Assert.That(cleanupSpace.QuotaUsedBytes, Is.EqualTo(startSpace.QuotaUsedBytes));
+            Assert.That(cleanupSpace.FreeBytes, Is.EqualTo(startSpace.FreeBytes));
+        }
+
+        [Test]
+        public void DeletesExpiredDataUsedByStorageRequests()
+        {
+            var fileSize = 100.MB();
+            var blockTtl = TimeSpan.FromMinutes(1.0);
+            var interval = TimeSpan.FromSeconds(10.0);
+
+            var geth = StartGethNode(s => s.IsMiner());
+            var contracts = Ci.StartCodexContracts(geth);
+            var node = StartCodex(s => s
+                .EnableMarketplace(geth, contracts, m => m.WithInitial(100.Eth(), 100.Tst()))
+                .WithBlockTTL(blockTtl)
+                .WithBlockMaintenanceInterval(interval)
+                .WithBlockMaintenanceNumber(100000)
+            );
+
+            var startSpace = node.Space();
+            Assert.That(startSpace.QuotaUsedBytes, Is.EqualTo(0));
+
+            var cid = node.UploadFile(GenerateTestFile(fileSize));
+            var purchase = node.Marketplace.RequestStorage(new CodexClient.StoragePurchaseRequest(cid)
+            {
+                Duration = TimeSpan.FromHours(1.0),
+                Expiry = blockTtl,
+                MinRequiredNumberOfNodes = 3,
+                NodeFailureTolerance = 1,
+                PricePerBytePerSecond = 1000.TstWei(),
+                ProofProbability = 20,
+                CollateralPerByte = 100.TstWei()
+            });
+            var usedSpace = node.Space();
+            var usedFiles = node.LocalFiles();
+            Assert.That(usedSpace.QuotaUsedBytes, Is.GreaterThanOrEqualTo(fileSize.SizeInBytes));
+            Assert.That(usedSpace.FreeBytes, Is.LessThanOrEqualTo(startSpace.FreeBytes - fileSize.SizeInBytes));
+            Assert.That(usedFiles.Content.Length, Is.EqualTo(2));
+
+            Thread.Sleep(blockTtl * 2);
+
+            var cleanupSpace = node.Space();
+            var cleanupFiles = node.LocalFiles();
+
+            Assert.That(cleanupSpace.QuotaUsedBytes, Is.LessThan(usedSpace.QuotaUsedBytes));
+            Assert.That(cleanupSpace.FreeBytes, Is.GreaterThan(usedSpace.FreeBytes));
+            Assert.That(cleanupFiles.Content.Length, Is.EqualTo(0));
+
+            Assert.That(cleanupSpace.QuotaUsedBytes, Is.EqualTo(startSpace.QuotaUsedBytes));
+            Assert.That(cleanupSpace.FreeBytes, Is.EqualTo(startSpace.FreeBytes));
+        }
+    }
+}