diff --git a/tests/functions/__init__.py b/tests/functions/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/functions/test_escape_like.py b/tests/functions/test_escape_like.py
new file mode 100644
index 0000000..d1f78ca
--- /dev/null
+++ b/tests/functions/test_escape_like.py
@@ -0,0 +1,7 @@
+from sqlalchemy_utils import escape_like
+from tests import TestCase
+
+
+class TestEscapeLike(TestCase):
+    def test_escapes_wildcards(self):
+        assert escape_like('_*%') == '*_***%'
diff --git a/tests/functions/test_identity.py b/tests/functions/test_identity.py
new file mode 100644
index 0000000..202bdfe
--- /dev/null
+++ b/tests/functions/test_identity.py
@@ -0,0 +1,16 @@
+import sqlalchemy as sa
+from sqlalchemy_utils.functions import identity
+from tests import TestCase
+
+
+class TestIdentity(TestCase):
+    def create_models(self):
+        class Building(self.Base):
+            __tablename__ = 'building'
+            id = sa.Column(sa.Integer, primary_key=True)
+            name = sa.Column(sa.Unicode(255))
+
+        self.Building = Building
+
+    def test_for_transient_class_without_id(self):
+        assert identity(self.Building()) == (None,)
diff --git a/tests/functions/test_naturally_equivalent.py b/tests/functions/test_naturally_equivalent.py
new file mode 100644
index 0000000..c443e4d
--- /dev/null
+++ b/tests/functions/test_naturally_equivalent.py
@@ -0,0 +1,14 @@
+from sqlalchemy_utils.functions import naturally_equivalent
+from tests import TestCase
+
+
+class TestNaturallyEquivalent(TestCase):
+    def test_returns_true_when_properties_match(self):
+        assert naturally_equivalent(
+            self.User(name=u'someone'), self.User(name=u'someone')
+        )
+
+    def test_skips_primary_keys(self):
+        assert naturally_equivalent(
+            self.User(id=1, name=u'someone'), self.User(id=2, name=u'someone')
+        )
diff --git a/tests/functions/test_non_indexed_foreign_keys.py b/tests/functions/test_non_indexed_foreign_keys.py
new file mode 100644
index 0000000..d7442e8
--- /dev/null
+++ b/tests/functions/test_non_indexed_foreign_keys.py
@@ -0,0 +1,56 @@
+import sqlalchemy as sa
+from sqlalchemy_utils import escape_like
+from tests import TestCase
+from sqlalchemy_utils.functions import non_indexed_foreign_keys
+
+
+class TestEscapeLike(TestCase):
+    def test_escapes_wildcards(self):
+        assert escape_like('_*%') == '*_***%'
+
+
+class TestFindNonIndexedForeignKeys(TestCase):
+    def create_models(self):
+        class User(self.Base):
+            __tablename__ = 'user'
+            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
+            name = sa.Column(sa.Unicode(255))
+
+        class Category(self.Base):
+            __tablename__ = 'category'
+            id = sa.Column(sa.Integer, primary_key=True)
+            name = sa.Column(sa.Unicode(255))
+
+        class Article(self.Base):
+            __tablename__ = 'article'
+            id = sa.Column(sa.Integer, primary_key=True)
+            name = sa.Column(sa.Unicode(255))
+            author_id = sa.Column(
+                sa.Integer, sa.ForeignKey(User.id), index=True
+            )
+            category_id = sa.Column(sa.Integer, sa.ForeignKey(Category.id))
+
+            category = sa.orm.relationship(
+                Category,
+                primaryjoin=category_id == Category.id,
+                backref=sa.orm.backref(
+                    'articles',
+                )
+            )
+
+        self.User = User
+        self.Category = Category
+        self.Article = Article
+
+    def test_finds_all_non_indexed_fks(self):
+        fks = non_indexed_foreign_keys(self.Base.metadata, self.engine)
+        assert (
+            'article' in
+            fks
+        )
+        column_names = [
+            column_name for column_name in fks['article'][0].columns
+        ]
+        assert 'category_id' in column_names
+        assert 'author_id' not in column_names
+
diff --git a/tests/functions/test_render.py b/tests/functions/test_render.py
new file mode 100644
index 0000000..8855400
--- /dev/null
+++ b/tests/functions/test_render.py
@@ -0,0 +1,51 @@
+import sqlalchemy as sa
+from tests import TestCase
+from sqlalchemy_utils.functions import (
+    render_statement,
+    render_expression,
+    mock_engine
+)
+
+
+class TestRender(TestCase):
+    def create_models(self):
+        class User(self.Base):
+            __tablename__ = 'user'
+            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
+            name = sa.Column(sa.Unicode(255))
+
+        self.User = User
+
+    def test_render_statement_query(self):
+        query = self.session.query(self.User).filter_by(id=3)
+        text = render_statement(query)
+
+        assert 'SELECT user.id, user.name' in text
+        assert 'FROM user' in text
+        assert 'WHERE user.id = 3' in text
+
+    def test_render_statement(self):
+        statement = self.User.__table__.select().where(self.User.id == 3)
+        text = render_statement(statement, bind=self.session.bind)
+
+        assert 'SELECT user.id, user.name' in text
+        assert 'FROM user' in text
+        assert 'WHERE user.id = 3' in text
+
+    def test_render_ddl(self):
+        expression = 'self.User.__table__.create(engine)'
+        stream = render_expression(expression, self.engine)
+
+        text = stream.getvalue()
+
+        assert 'CREATE TABLE user' in text
+        assert 'PRIMARY KEY' in text
+
+    def test_render_mock_ddl(self):
+        with mock_engine('self.engine') as stream:
+            self.User.__table__.create(self.engine)
+
+        text = stream.getvalue()
+
+        assert 'CREATE TABLE user' in text
+        assert 'PRIMARY KEY' in text
diff --git a/tests/test_table_name.py b/tests/functions/test_table_name.py
similarity index 100%
rename from tests/test_table_name.py
rename to tests/functions/test_table_name.py
diff --git a/tests/test_utility_functions.py b/tests/test_utility_functions.py
deleted file mode 100644
index b28b046..0000000
--- a/tests/test_utility_functions.py
+++ /dev/null
@@ -1,120 +0,0 @@
-import sqlalchemy as sa
-from sqlalchemy_utils import escape_like
-from sqlalchemy_utils.functions import naturally_equivalent
-from tests import TestCase
-from sqlalchemy_utils.functions import (
-    non_indexed_foreign_keys,
-    render_statement,
-    render_expression,
-    mock_engine
-)
-
-
-class TestEscapeLike(TestCase):
-    def test_escapes_wildcards(self):
-        assert escape_like('_*%') == '*_***%'
-
-
-class TestNaturallyEquivalent(TestCase):
-    def test_returns_true_when_properties_match(self):
-        assert naturally_equivalent(
-            self.User(name=u'someone'), self.User(name=u'someone')
-        )
-
-    def test_skips_primary_keys(self):
-        assert naturally_equivalent(
-            self.User(id=1, name=u'someone'), self.User(id=2, name=u'someone')
-        )
-
-
-class TestFindNonIndexedForeignKeys(TestCase):
-    # dns = 'postgres://postgres@localhost/sqlalchemy_utils_test'
-
-    def create_models(self):
-        class User(self.Base):
-            __tablename__ = 'user'
-            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
-            name = sa.Column(sa.Unicode(255))
-
-        class Category(self.Base):
-            __tablename__ = 'category'
-            id = sa.Column(sa.Integer, primary_key=True)
-            name = sa.Column(sa.Unicode(255))
-
-        class Article(self.Base):
-            __tablename__ = 'article'
-            id = sa.Column(sa.Integer, primary_key=True)
-            name = sa.Column(sa.Unicode(255))
-            author_id = sa.Column(
-                sa.Integer, sa.ForeignKey(User.id), index=True
-            )
-            category_id = sa.Column(sa.Integer, sa.ForeignKey(Category.id))
-
-            category = sa.orm.relationship(
-                Category,
-                primaryjoin=category_id == Category.id,
-                backref=sa.orm.backref(
-                    'articles',
-                )
-            )
-
-        self.User = User
-        self.Category = Category
-        self.Article = Article
-
-    def test_finds_all_non_indexed_fks(self):
-        fks = non_indexed_foreign_keys(self.Base.metadata, self.engine)
-        assert (
-            'article' in
-            fks
-        )
-        column_names = [
-            column_name for column_name in fks['article'][0].columns
-        ]
-        assert 'category_id' in column_names
-        assert 'author_id' not in column_names
-
-
-class TestRender(TestCase):
-
-    def create_models(self):
-        class User(self.Base):
-            __tablename__ = 'user'
-            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
-            name = sa.Column(sa.Unicode(255))
-
-        self.User = User
-
-    def test_render_statement_query(self):
-        query = self.session.query(self.User).filter_by(id=3)
-        text = render_statement(query)
-
-        assert 'SELECT user.id, user.name' in text
-        assert 'FROM user' in text
-        assert 'WHERE user.id = 3' in text
-
-    def test_render_statement(self):
-        statement = self.User.__table__.select().where(self.User.id == 3)
-        text = render_statement(statement, bind=self.session.bind)
-
-        assert 'SELECT user.id, user.name' in text
-        assert 'FROM user' in text
-        assert 'WHERE user.id = 3' in text
-
-    def test_render_ddl(self):
-        expression = 'self.User.__table__.create(engine)'
-        stream = render_expression(expression, self.engine)
-
-        text = stream.getvalue()
-
-        assert 'CREATE TABLE user' in text
-        assert 'PRIMARY KEY' in text
-
-    def test_render_mock_ddl(self):
-        with mock_engine('self.engine') as stream:
-            self.User.__table__.create(self.engine)
-
-        text = stream.getvalue()
-
-        assert 'CREATE TABLE user' in text
-        assert 'PRIMARY KEY' in text