diff --git a/tools/test/bin/onos-uninstall b/tools/test/bin/onos-uninstall
index cf767c4..557036f 100755
--- a/tools/test/bin/onos-uninstall
+++ b/tools/test/bin/onos-uninstall
@@ -39,6 +39,8 @@
     # Remove onos directory and init file
     [ -d $ONOS_INSTALL_DIR ] && sudo rm -fr $ONOS_INSTALL_DIR
     [ -f /etc/init/onos.conf ] && sudo rm -f /etc/init/onos.conf
+    [ -f /etc/init.d/onos ] && sudo rm -f /etc/init.d/onos
+    [ -f /etc/systemd/system/onos.service ] && sudo rm -f /etc/systemd/system/onos.service
 
     exit \${status:-0};
 "