diff --git a/test/relay.c b/test/relay.c
index 77a40849..8bddec8c 100644
--- a/test/relay.c
+++ b/test/relay.c
@@ -129,9 +129,10 @@ setup (Fixture *f,
   dbus_error_init (&f->e);
   g_queue_init (&f->messages);
 
-  if ((g_str_has_prefix (address, "tcp:") ||
-       g_str_has_prefix (address, "nonce-tcp:")) &&
-      !test_check_tcp_works ())
+  if ((g_str_has_prefix (address, "unix:") && !test_check_af_unix_works ()) ||
+      ((g_str_has_prefix (address, "tcp:") ||
+        g_str_has_prefix (address, "nonce-tcp:")) &&
+       !test_check_tcp_works ()))
     {
       f->skip = TRUE;
       return;
@@ -354,14 +355,12 @@ main (int argc,
   g_test_add ("/limit/tcp", Fixture, "tcp:host=127.0.0.1", setup,
       test_limit, teardown);
 
-#ifdef DBUS_UNIX
   g_test_add ("/connect/unix", Fixture, unix_tmpdir, setup,
       test_connect, teardown);
   g_test_add ("/relay/unix", Fixture, unix_tmpdir, setup,
       test_relay, teardown);
   g_test_add ("/limit/unix", Fixture, unix_tmpdir, setup,
       test_limit, teardown);
-#endif
 
   ret = g_test_run ();
   dbus_shutdown ();