diff --git a/CHANGES.txt b/CHANGES.txt
index b841e32..3b28da1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 2.12.1 - unreleased
 -------------------
 
+- Disabled ``check_tid_ordering_w_commit`` test from BasicStorage, as it uses
+  invalid test data.
+
 
 2.12.0 - 2010-09-25
 -------------------
diff --git a/src/tempstorage/tests/testTemporaryStorage.py b/src/tempstorage/tests/testTemporaryStorage.py
index ef8b9dd..055a254 100644
--- a/src/tempstorage/tests/testTemporaryStorage.py
+++ b/src/tempstorage/tests/testTemporaryStorage.py
@@ -36,6 +36,12 @@ def open(self, **kwargs):
         from tempstorage.TemporaryStorage import TemporaryStorage
         self._storage = TemporaryStorage('foo')
 
+    def check_tid_ordering_w_commit(self):
+        # The test uses invalid test data of 'x'. The normal storages
+        # don't load the actual data and thus pass, but the tempstorage
+        # will always try to load the data and fail
+        pass
+
 
 class TemporaryStorageTests(unittest.TestCase):