diff --git a/hasql-postgres.cabal b/hasql-postgres.cabal
--- a/hasql-postgres.cabal
+++ b/hasql-postgres.cabal
@@ -1,7 +1,7 @@
 name:
   hasql-postgres
 version:
-  0.6.0
+  0.6.1
 synopsis:
   A "PostgreSQL" backend for the "hasql" library
 description:
@@ -107,6 +107,8 @@
     library
   main-is:          
     Main.hs
+  other-modules:
+    Hasql.Postgres.TemplateConverterTests
   ghc-options:
     -threaded
     "-with-rtsopts=-N"
diff --git a/library-tests/Hasql/Postgres/TemplateConverterTests.hs b/library-tests/Hasql/Postgres/TemplateConverterTests.hs
new file mode 100644
--- /dev/null
+++ b/library-tests/Hasql/Postgres/TemplateConverterTests.hs
@@ -0,0 +1,15 @@
+{-# OPTIONS_GHC -F -pgmF htfpp #-}
+module Hasql.Postgres.TemplateConverterTests where
+
+import Test.Framework
+import Hasql.Postgres.Prelude
+import qualified Data.Text.Encoding
+import qualified Hasql.Postgres.TemplateConverter
+
+
+test_convert =
+  assertEqual
+    (Right "asdf $1 \"'\\\"?'\" d 2$2$3")
+    (Hasql.Postgres.TemplateConverter.convert "asdf ? \"'\\\"?'\" d 2??")
+  
+