diff --git a/bin/setup-base-dir b/bin/setup-base-dir
index a405bf43f90af14635b77c6a7cc399523a781124_YmluL3NldHVwLWJhc2UtZGly..0102b4f8df9c6891c55dc969ed22c474f83060e6_YmluL3NldHVwLWJhc2UtZGly 100755
--- a/bin/setup-base-dir
+++ b/bin/setup-base-dir
@@ -132,8 +132,6 @@
     old_dir = os.curdir
     os.chdir(base_path)
     try:
-        install_poulpe(POULPE_DIR)
-        setup_quick_access(base_path)
 
         print("Create symlinks to Poulpe")
         tooling = Path(TOOLING)
@@ -149,6 +147,9 @@
             suite_name = b.name
             os.symlink('..' / b, bench / suite_name)
 
+        install_poulpe(local_poulpe)
+        setup_quick_access(base_path)
+
     finally:
         os.chdir(old_dir)
 
diff --git a/tests/test-setup-base-dir.t b/tests/test-setup-base-dir.t
index a405bf43f90af14635b77c6a7cc399523a781124_dGVzdHMvdGVzdC1zZXR1cC1iYXNlLWRpci50..0102b4f8df9c6891c55dc969ed22c474f83060e6_dGVzdHMvdGVzdC1zZXR1cC1iYXNlLWRpci50 100644
--- a/tests/test-setup-base-dir.t
+++ b/tests/test-setup-base-dir.t
@@ -9,5 +9,6 @@
 
   $ $PYTHON $SRC_DIR/bin/setup-base-dir benchmark-home
   Creating folders
+  Create symlinks to Poulpe
   Installing poulpe (editable) into a new venv
   Creating a "bin/" directory with some utility
@@ -12,6 +13,5 @@
   Installing poulpe (editable) into a new venv
   Creating a "bin/" directory with some utility
-  Create symlinks to Poulpe
   cloning repositories to benchmark
   updating environment variable