diff --git a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
index 00fdac3dd5..94e5d46e31 100644
--- a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
+++ b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
@@ -32,6 +32,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.TimeZone;
 import java.util.UUID;
 import javax.inject.Inject;
@@ -446,6 +447,18 @@ public void join( final long millis ) throws InterruptedException {
 
         restore( authenticator, catalog );
 
+        // For convenience, try to start a unix listener directly in the .polypheny folder
+        if ( Catalog.mode == RunMode.TEST || Catalog.mode == RunMode.DEVELOPMENT ) {
+            try {
+                QueryInterfaceManager.getInstance().createQueryInterface( "Proto Interface (Unix transport)",
+                        "proto-interface-homedir-unix",
+                        Map.of( "path", PolyphenyHomeDirManager.getInstance().registerNewGlobalFile( "polypheny-proto.sock" ).getAbsolutePath() ) );
+            } catch ( Throwable t ) {
+                // As this is a convenience feature, we do not abort if it fails
+                log.info( "Could not start homedir unix listener: " + t.getMessage() );
+            }
+        }
+
         // Add tracker, which rechecks constraints after enabling
         ConstraintTracker tracker = new ConstraintTracker( transactionManager );
         RuntimeConfig.FOREIGN_KEY_ENFORCEMENT.addObserver( tracker );