diff --git a/tests/test_replication.py b/tests/test_replication.py
old mode 100644
new mode 100755
index 2ccd4c77..33a8065a
--- a/tests/test_replication.py
+++ b/tests/test_replication.py
@@ -23,7 +23,6 @@
 # License for more details.
 
 import psycopg2
-import psycopg2.extensions
 from psycopg2.extras import (
     PhysicalReplicationConnection, LogicalReplicationConnection, StopReplication)
 
@@ -89,6 +88,20 @@ class ReplicationTest(ReplicationTestCase):
         cur.execute("IDENTIFY_SYSTEM")
         cur.fetchall()
 
+    @skip_before_postgres(9, 0)
+    def test_datestyle(self):
+        if testconfig.repl_dsn is None:
+            return self.skipTest("replication tests disabled by default")
+
+        conn = self.repl_connect(
+            dsn=testconfig.repl_dsn, options='-cdatestyle=german',
+            connection_factory=PhysicalReplicationConnection)
+        if conn is None:
+            return
+        cur = conn.cursor()
+        cur.execute("IDENTIFY_SYSTEM")
+        cur.fetchall()
+
     @skip_before_postgres(9, 4)
     def test_logical_replication_connection(self):
         conn = self.repl_connect(connection_factory=LogicalReplicationConnection)
@@ -168,7 +181,7 @@ class AsyncReplicationTest(ReplicationTestCase):
             connection_factory=LogicalReplicationConnection, async=1)
         if conn is None:
             return
-        self.wait(conn)
+
         cur = conn.cursor()
 
         self.create_replication_slot(cur, output_plugin='test_decoding')
diff --git a/tests/testutils.py b/tests/testutils.py
index 1dd0c999..93477357 100644
--- a/tests/testutils.py
+++ b/tests/testutils.py
@@ -130,8 +130,17 @@ class ConnectingTestCase(unittest.TestCase):
         import psycopg2
         try:
             conn = self.connect(**kwargs)
+            if conn.async == 1:
+                self.wait(conn)
         except psycopg2.OperationalError, e:
-            return self.skipTest("replication db not configured: %s" % e)
+            # If pgcode is not set it is a genuine connection error
+            # Otherwise we tried to run some bad operation in the connection
+            # (e.g. bug #482) and we'd rather know that.
+            if e.pgcode is None:
+                return self.skipTest("replication db not configured: %s" % e)
+            else:
+                raise
+
         return conn
 
     def _get_conn(self):