diff --git a/Android.mk b/Android.mk
index b4c4000..5a0ffbb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,21 +62,6 @@ LOCAL_CFLAGS := \
     -std=c++1y
 include $(BUILD_EXECUTABLE)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := anbox_test_platform_service
-LOCAL_SRC_FILES := \
-    android/service/platform_service_interface.cpp \
-    android/service/test_platform_service.cpp
-LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/android/service
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libbinder \
-    libcutils \
-    libutils
-include $(BUILD_EXECUTABLE)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := \
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 86103d8..7d818ea 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -24,11 +24,6 @@ target_link_libraries(anboxd
     process-cpp
     anbox-protobuf)
 
-set(TEST_PLATFORM_SERVICE
-    service/test_platform_service.cpp)
-
-add_executable(test_platform_service ${TEST_PLATFORM_SERVICE})
-
 set(HWCOMPOSER_SOURCES
     hwcomposer/hwcomposer.cpp)
 
@@ -40,9 +35,6 @@ add_library(hwcomposer.anbox SHARED ${HWCOMPOSER_SOURCES})
 set_target_properties(anboxd
     PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
 
-set_target_properties(test_platform_service
-    PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
-
 set_target_properties(hwcomposer.anbox
     PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
 
diff --git a/android/service/test_platform_service.cpp b/android/service/test_platform_service.cpp
deleted file mode 100644
index 1435477..0000000
--- a/android/service/test_platform_service.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2016 Simon Fels <morphis@gravedo.de>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <binder/IPCThreadState.h>
-#include <binder/ProcessState.h>
-#include <binder/IServiceManager.h>
-
-#include "android/service/platform_service_interface.h"
-
-int main(int, char**) {
-    auto binder = android::defaultServiceManager()->getService(android::String16("anbox.PlatformService"));
-    if (not binder.get())
-        return 0;
-
-    android::ProcessState::self()->startThreadPool();
-
-    android::sp<android::BpPlatformService> platform_service = new android::BpPlatformService(binder);
-
-    return platform_service->boot_finished();
-}