3 files changed, 10 insertions, 6 deletions
diff --git a/messagebus_test/src/tests/speed/CMakeLists.txt b/messagebus_test/src/tests/speed/CMakeLists.txt
index 84092021584..5a5f9615c42 100644
--- a/messagebus_test/src/tests/speed/CMakeLists.txt
+++ b/messagebus_test/src/tests/speed/CMakeLists.txt
@@ -3,19 +3,19 @@ vespa_add_executable(messagebus_test_speed_test_app
     SOURCES
     speed.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-speed_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-client-speed_app
     SOURCES
     cpp-client.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_test(NAME messagebus_test_speed_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/speed_test.sh BENCHMARK
                DEPENDS messagebus_test_speed_test_app messagebus_test_cpp-server-speed_app messagebus_test_cpp-client-speed_app )
diff --git a/messagebus_test/src/tests/speed/speed.cpp b/messagebus_test/src/tests/speed/speed.cpp
index 3a5f56c6144..1cfe1ff5704 100644
--- a/messagebus_test/src/tests/speed/speed.cpp
+++ b/messagebus_test/src/tests/speed/speed.cpp
@@ -37,7 +37,7 @@ Test::Main()
         fprintf(stderr, "STARTING JAVA-CLIENT\n");
         EXPECT_EQUAL(system("../../binref/runjava JavaClient"), 0);
         fprintf(stderr, "STOPPING\n");
-        EXPECT_EQUAL(system((ctl_script + " stop server cpp"), 0);
+        EXPECT_EQUAL(system((ctl_script + " stop server cpp").c_str()), 0);
     }
     { // JAVA SERVER
         { // Make routing config
diff --git a/messagebus_test/src/tests/speed/speed_test.sh b/messagebus_test/src/tests/speed/speed_test.sh
index 4aefc712fb9..1d9ba27f84e 100755
--- a/messagebus_test/src/tests/speed/speed_test.sh
+++ b/messagebus_test/src/tests/speed/speed_test.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -e
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 . ../../binref/env.sh
 
-$BINREF/compilejava JavaServer.java
-$BINREF/compilejava JavaClient.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaServer.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaClient.java
 
 (ulimit -c; ulimit -H -c; ulimit -c unlimited; $VALGRIND ./messagebus_test_speed_test_app)