diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f57b9a343252ffe77ac4fea11094076c37c0611c..634763602089e3f048c0244ea748c6c7034e9728 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build_test:
         - cd ../../fpm
         - mkdir build
         - cd build
-        - cmake -DCMAKE_PREFIX_PATH=${CI_PROJECT_DIR}/../waves -Wno-dev ..
+        - cmake -Wno-dev .. # -DCMAKE_PREFIX_PATH=${CI_PROJECT_DIR}/../waves (handled by default)
         - make -j $(nproc)
         - ctest -j $(nproc) --output-on-failure #--verbose
         - mv ${CI_PROJECT_DIR}/../waves/scripts/format_code.py . # ulgy way to keep a script we need later...
@@ -53,7 +53,6 @@ format:
     stage: fmt_dox
     script:
         - clang-format --version # we use clang-format-10 exclusively
-        - ls build
         - ./build/format_code.py
         - mkdir -p patches
         - if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi
diff --git a/fpm/src/CMakeLists.txt b/fpm/src/CMakeLists.txt
index c583cfd623cfc06babfe679eaa52d0d7fe66bcfe..15f283e16e513b3fbea89479fd032b522be76ef2 100644
--- a/fpm/src/CMakeLists.txt
+++ b/fpm/src/CMakeLists.txt
@@ -26,7 +26,10 @@ FIND_PACKAGE(EIGEN 3.3.4 REQUIRED)
 TARGET_INCLUDE_DIRECTORIES(fpm PUBLIC ${EIGEN_INCLUDE_DIRS})
 TARGET_COMPILE_DEFINITIONS(fpm PUBLIC EIGEN_DONT_PARALLELIZE)
 
-# -- WAVES
+# -- WAVES (if no path is provided, assume that it is located next to fpm)
+IF(NOT DEFINED CMAKE_PREFIX_PATH)
+    SET(CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/../waves/build")
+ENDIF()
 FIND_PACKAGE(WAVES REQUIRED)
 TARGET_INCLUDE_DIRECTORIES(fpm PUBLIC ${WAVES_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(fpm ${WAVES_LIBRARIES})