9 files changed, 12 insertions, 12 deletions
diff --git a/documentapi/src/tests/loadtypes/CMakeLists.txt b/documentapi/src/tests/loadtypes/CMakeLists.txt
index 7c1e92b087f..e75fa7b8e0f 100644
--- a/documentapi/src/tests/loadtypes/CMakeLists.txt
+++ b/documentapi/src/tests/loadtypes/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_loadtype_test_app
+vespa_add_executable(documentapi_loadtype_test_app TEST
     SOURCES
     loadtypetest.cpp
     testrunner.cpp
diff --git a/documentapi/src/tests/messagebus/CMakeLists.txt b/documentapi/src/tests/messagebus/CMakeLists.txt
index 0f0760c1b57..de85fedc97e 100644
--- a/documentapi/src/tests/messagebus/CMakeLists.txt
+++ b/documentapi/src/tests/messagebus/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_messagebus_test_app
+vespa_add_executable(documentapi_messagebus_test_app TEST
     SOURCES
     messagebus_test.cpp
     DEPENDS
diff --git a/documentapi/src/tests/messages/CMakeLists.txt b/documentapi/src/tests/messages/CMakeLists.txt
index bfffd0d0502..fc7560254a1 100644
--- a/documentapi/src/tests/messages/CMakeLists.txt
+++ b/documentapi/src/tests/messages/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_messages50_test_app
+vespa_add_executable(documentapi_messages50_test_app TEST
     SOURCES
     testbase.cpp
     messages50test.cpp
@@ -8,7 +8,7 @@ vespa_add_executable(documentapi_messages50_test_app
     documentapi
 )
 vespa_add_test(NAME documentapi_messages50_test_app COMMAND documentapi_messages50_test_app)
-vespa_add_executable(documentapi_messages51_test_app
+vespa_add_executable(documentapi_messages51_test_app TEST
     SOURCES
     testbase.cpp
     messages50test.cpp
@@ -18,7 +18,7 @@ vespa_add_executable(documentapi_messages51_test_app
     documentapi
 )
 vespa_add_test(NAME documentapi_messages51_test_app COMMAND documentapi_messages51_test_app)
-vespa_add_executable(documentapi_messages52_test_app
+vespa_add_executable(documentapi_messages52_test_app TEST
     SOURCES
     testbase.cpp
     messages50test.cpp
@@ -29,7 +29,7 @@ vespa_add_executable(documentapi_messages52_test_app
     documentapi
 )
 vespa_add_test(NAME documentapi_messages52_test_app COMMAND documentapi_messages52_test_app)
-vespa_add_executable(documentapi_error_codes_test_app_app
+vespa_add_executable(documentapi_error_codes_test_app_app TEST
     SOURCES
     error_codes_test.cpp
     DEPENDS
diff --git a/documentapi/src/tests/policies/CMakeLists.txt b/documentapi/src/tests/policies/CMakeLists.txt
index dcf0f4bef4b..a749997a612 100644
--- a/documentapi/src/tests/policies/CMakeLists.txt
+++ b/documentapi/src/tests/policies/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_policies_test_app
+vespa_add_executable(documentapi_policies_test_app TEST
     SOURCES
     testframe.cpp
     policies_test.cpp
diff --git a/documentapi/src/tests/policyfactory/CMakeLists.txt b/documentapi/src/tests/policyfactory/CMakeLists.txt
index c533847ff36..6b8090ec60d 100644
--- a/documentapi/src/tests/policyfactory/CMakeLists.txt
+++ b/documentapi/src/tests/policyfactory/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_policyfactory_test_app
+vespa_add_executable(documentapi_policyfactory_test_app TEST
     SOURCES
     policyfactory.cpp
     DEPENDS
diff --git a/documentapi/src/tests/priority/CMakeLists.txt b/documentapi/src/tests/priority/CMakeLists.txt
index 289ea4b4ebe..5e2a35f06a1 100644
--- a/documentapi/src/tests/priority/CMakeLists.txt
+++ b/documentapi/src/tests/priority/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_priority_test_app
+vespa_add_executable(documentapi_priority_test_app TEST
     SOURCES
     priority.cpp
     DEPENDS
diff --git a/documentapi/src/tests/replymerger/CMakeLists.txt b/documentapi/src/tests/replymerger/CMakeLists.txt
index 9faa203fb2b..c2267f8d3ff 100644
--- a/documentapi/src/tests/replymerger/CMakeLists.txt
+++ b/documentapi/src/tests/replymerger/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_replymerger_test_app
+vespa_add_executable(documentapi_replymerger_test_app TEST
     SOURCES
     replymerger_test.cpp
     DEPENDS
diff --git a/documentapi/src/tests/routablefactory/CMakeLists.txt b/documentapi/src/tests/routablefactory/CMakeLists.txt
index ba6ea53bf8f..0d7179261bc 100644
--- a/documentapi/src/tests/routablefactory/CMakeLists.txt
+++ b/documentapi/src/tests/routablefactory/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_routablefactory_test_app
+vespa_add_executable(documentapi_routablefactory_test_app TEST
     SOURCES
     routablefactory.cpp
     DEPENDS
diff --git a/documentapi/src/tests/systemstate/CMakeLists.txt b/documentapi/src/tests/systemstate/CMakeLists.txt
index a1a88c66278..539bd7386cc 100644
--- a/documentapi/src/tests/systemstate/CMakeLists.txt
+++ b/documentapi/src/tests/systemstate/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(documentapi_systemstate_test_app
+vespa_add_executable(documentapi_systemstate_test_app TEST
     SOURCES
     systemstate.cpp
     DEPENDS