--- a/MySQLdb/__init__.py	Thu Feb 12 00:28:34 2009 +0000
+++ b/MySQLdb/__init__.py	Thu Feb 12 00:36:39 2009 +0000
@@ -58,18 +58,6 @@
 DATETIME  = TIMESTAMP
 ROWID     = DBAPISet()
 
-def test_DBAPISet_set_equality():
-    assert STRING == STRING
-
-def test_DBAPISet_set_inequality():
-    assert STRING != NUMBER
-
-def test_DBAPISet_set_equality_membership():
-    assert FIELD_TYPE.VAR_STRING == STRING
-
-def test_DBAPISet_set_inequality_membership():
-    assert FIELD_TYPE.DATE != STRING
-
 def Binary(x):
     """Return x as a binary type."""
     return str(x)

--- a/tests/test_MySQLdb_nonstandard.py	Thu Feb 12 00:28:34 2009 +0000
+++ b/tests/test_MySQLdb_nonstandard.py	Thu Feb 12 00:36:39 2009 +0000
@@ -1,6 +1,21 @@
 import unittest
 
 import MySQLdb
+from MySQLdb.constants import FIELD_TYPE
+
+
+class TestDBAPISet(unittest.TestCase):
+    def test_set_equality(self):
+        self.assertTrue(MySQLdb.STRING == MySQLdb.STRING)
+
+    def test_set_inequality(self):
+        self.assertTrue(MySQLdb.STRING != MySQLdb.NUMBER)
+
+    def test_set_equality_membership(self):
+        self.assertTrue(FIELD_TYPE.VAR_STRING == MySQLdb.STRING)
+
+    def test_set_inequality_membership(self):
+        self.assertTrue(FIELD_TYPE.DATE != MySQLdb.STRING)
 
 
 class NonStandard(unittest.TestCase):