Index: autotests/libs/testrunner/CMakeLists.txt
===================================================================
--- autotests/libs/testrunner/CMakeLists.txt
+++ autotests/libs/testrunner/CMakeLists.txt
@@ -11,6 +11,7 @@
 add_executable(akonaditest ${akonaditest_SRCS})
 
 target_link_libraries(akonaditest
+  KF5::AkonadiPrivate
   KF5::AkonadiCore 
   KF5::I18n
   KF5::ConfigCore
Index: autotests/libs/testrunner/setup.cpp
===================================================================
--- autotests/libs/testrunner/setup.cpp
+++ autotests/libs/testrunner/setup.cpp
@@ -22,6 +22,7 @@
 #include <agentinstance.h>
 #include <agentinstancecreatejob.h>
 #include <resourcesynchronizationjob.h>
+#include <private/standarddirs_p.h>
 
 #include <KConfig>
 #include <kconfiggroup.h>
@@ -45,7 +46,7 @@
                 this, &SetupTest::slotAkonadiDaemonProcessFinished);
     }
 
-    mAkonadiDaemonProcess->setProgram(QStringLiteral("akonadi_control"),
+    mAkonadiDaemonProcess->setProgram(Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_control")),
                                       { QStringLiteral("--instance"), instanceId() });
     mAkonadiDaemonProcess->start();
     const bool started = mAkonadiDaemonProcess->waitForStarted(5000);
Index: src/akonadicontrol/processcontrol.cpp
===================================================================
--- src/akonadicontrol/processcontrol.cpp
+++ src/akonadicontrol/processcontrol.cpp
@@ -23,6 +23,7 @@
 #include <shared/akapplication.h>
 
 #include <private/instance_p.h>
+#include <private/standarddirs_p.h>
 
 #include <QTimer>
 
@@ -171,6 +172,9 @@
 
 void ProcessControl::start()
 {
+    // Prefer akonadiserver from the builddir
+    mApplication = StandardDirs::findExecutable(mApplication);
+
 #ifdef Q_OS_UNIX
     QString agentValgrind = akGetEnv("AKONADI_VALGRIND");
     if (!agentValgrind.isEmpty() && (mApplication.contains(agentValgrind) || listContains(mArguments, agentValgrind))) {