diff --git a/lib/sql.py b/lib/sql.py
new file mode 100644
index 00000000..aec0e292
--- /dev/null
+++ b/lib/sql.py
@@ -0,0 +1,25 @@
+"""SQL composition utility module
+"""
+
+# psycopg/sql.py - Implementation of the JSON adaptation objects
+#
+# Copyright (C) 2016 Daniele Varrazzo  <daniele.varrazzo@gmail.com>
+#
+# psycopg2 is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link this program with the OpenSSL library (or with
+# modified versions of OpenSSL that use the same license as OpenSSL),
+# and distribute linked combinations including the two.
+#
+# You must obey the GNU Lesser General Public License in all respects for
+# all of the code used other than OpenSSL.
+#
+# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+
diff --git a/tests/__init__.py b/tests/__init__.py
index 1a240994..95f5b9de 100755
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -31,7 +31,6 @@ import test_bugX000
 import test_bug_gc
 import test_cancel
 import test_connection
-import test_replication
 import test_copy
 import test_cursor
 import test_dates
@@ -44,6 +43,8 @@ import test_module
 import test_notify
 import test_psycopg2_dbapi20
 import test_quote
+import test_replication
+import test_sql
 import test_transaction
 import test_types_basic
 import test_types_extras
@@ -68,7 +69,6 @@ def test_suite():
     suite.addTest(test_bug_gc.test_suite())
     suite.addTest(test_cancel.test_suite())
     suite.addTest(test_connection.test_suite())
-    suite.addTest(test_replication.test_suite())
     suite.addTest(test_copy.test_suite())
     suite.addTest(test_cursor.test_suite())
     suite.addTest(test_dates.test_suite())
@@ -81,11 +81,14 @@ def test_suite():
     suite.addTest(test_notify.test_suite())
     suite.addTest(test_psycopg2_dbapi20.test_suite())
     suite.addTest(test_quote.test_suite())
+    suite.addTest(test_replication.test_suite())
+    suite.addTest(test_sql.test_suite())
     suite.addTest(test_transaction.test_suite())
     suite.addTest(test_types_basic.test_suite())
     suite.addTest(test_types_extras.test_suite())
     suite.addTest(test_with.test_suite())
     return suite
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/tests/test_ipaddress.py b/tests/test_ipaddress.py
index 97eabbaf..49413f46 100755
--- a/tests/test_ipaddress.py
+++ b/tests/test_ipaddress.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-# # test_ipaddress.py - tests for ipaddress support #
+#
+# test_ipaddress.py - tests for ipaddress support
+#
 # Copyright (C) 2016 Daniele Varrazzo  <daniele.varrazzo@gmail.com>
 #
 # psycopg2 is free software: you can redistribute it and/or modify it
diff --git a/tests/test_sql.py b/tests/test_sql.py
new file mode 100755
index 00000000..e2f66709
--- /dev/null
+++ b/tests/test_sql.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+# test_sql.py - tests for the psycopg2.sql module
+#
+# Copyright (C) 2016 Daniele Varrazzo  <daniele.varrazzo@gmail.com>
+#
+# psycopg2 is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link this program with the OpenSSL library (or with
+# modified versions of OpenSSL that use the same license as OpenSSL),
+# and distribute linked combinations including the two.
+#
+# You must obey the GNU Lesser General Public License in all respects for
+# all of the code used other than OpenSSL.
+#
+# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+
+from testutils import unittest
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
+
+if __name__ == "__main__":
+    unittest.main()