diff --git a/picard/util/pipe.py b/picard/util/pipe.py
index e01c15271..89c809441 100644
--- a/picard/util/pipe.py
+++ b/picard/util/pipe.py
@@ -157,14 +157,18 @@ class Pipe:
             app_version = app_version.replace(".", "-")
             self.__pipe_parent_dir = self.PIPE_WIN_DIR
         elif self.__is_mac:
+            if not self.PIPE_MAC_DIR:
+                self.PIPE_MAC_DIR = os.path.join("./Library/Application Support/", PICARD_APP_ID)
             self.__pipe_parent_dir = self.PIPE_MAC_DIR
         else:
             self.__pipe_parent_dir = self.PIPE_UNIX_DIR
             if self.__pipe_parent_dir:
                 log.debug("Using pipe path: %r", self.__pipe_parent_dir)
             else:
-                log.warning("Using fallback pipe path: %r", self.__pipe_parent_dir)
+                if not self.PIPE_UNIX_FALLBACK_DIR:
+                    self.PIPE_UNIX_FALLBACK_DIR = "./.config/MusicBrainz/Picard/pipes/"
                 self.__pipe_parent_dir = self.PIPE_UNIX_FALLBACK_DIR
+                log.warning("Using fallback pipe path: %r", self.__pipe_parent_dir)
 
         pipe_name = f"{app_name}_v{app_version}_pipe_file"
         return os.path.join(self.__pipe_parent_dir, pipe_name)
diff --git a/test/test_util_pipe.py b/test/test_util_pipe.py
index d779b7f66..6719377da 100644
--- a/test/test_util_pipe.py
+++ b/test/test_util_pipe.py
@@ -69,21 +69,21 @@ class TestPipe(PicardTestCase):
     @unittest.skipUnless(IS_MACOS, "macos filename test")
     def test_filename_generation_macos(self):
         handler = pipe.Pipe(PICARD_APP_NAME, PICARD_FANCY_VERSION_STR)
-        MAC_PATH = join(pipe.Pipe.PIPE_MAC_DIR, self.SUFFIX)
+        MAC_PATH = join(handler.PIPE_MAC_DIR, self.SUFFIX)
         self.assertEquals(handler.path, MAC_PATH)
 
     @unittest.skipUnless(IS_WIN, "windows filename test")
     def test_filename_generation_win(self):
         handler = pipe.Pipe(PICARD_APP_NAME, PICARD_FANCY_VERSION_STR)
-        WIN_PATH = join(pipe.Pipe.PIPE_WIN_DIR, self.SUFFIX.replace('.', '-'))
+        WIN_PATH = join(handler.PIPE_WIN_DIR, self.SUFFIX.replace('.', '-'))
         self.assertEquals(handler.path, WIN_PATH)
 
     @unittest.skipUnless(not IS_MACOS and not IS_WIN, "unix filename test")
     def test_filename_generation_unix(self):
         handler = pipe.Pipe(PICARD_APP_NAME, PICARD_FANCY_VERSION_STR)
         UNIX_PATHS = {
-            join(pipe.Pipe.PIPE_UNIX_DIR, self.SUFFIX),
-            join(pipe.Pipe.PIPE_UNIX_FALLBACK_DIR, self.SUFFIX)
+            join(handler.PIPE_UNIX_DIR, self.SUFFIX),
+            join(handler.PIPE_UNIX_FALLBACK_DIR, self.SUFFIX)
         }
         self.assertIn(handler.path, UNIX_PATHS)