diff --git a/.travis.yml b/.travis.yml
index 38735de6..1daf43d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,8 @@ script:
     "cd /var/tmp &&
      yum install -y tar make rpm-build python2-devel python-setuptools &&
      make rpm && rpm -i mamonsu*.rpm &&
-     /etc/init.d/mamonsu restart"
+     /etc/init.d/mamonsu restart &&
+     yum remove -y mamonsu"
 # deb build
   - >
     docker run -v $(pwd):/var/tmp debian:6 bash -c
@@ -32,4 +33,5 @@ script:
      echo package mamonsu/log_level string 'INFO' | debconf-set-selections &&
      apt-get install -y make dpkg-dev debhelper python-dev python-setuptools &&
      make deb && dpkg -i mamonsu*.deb &&
-     /etc/init.d/mamonsu restart"
+     /etc/init.d/mamonsu restart &&
+     apt-get purge -y mamonsu"
diff --git a/debian/init b/debian/init
index 343f230a..d3f1bad2 100644
--- a/debian/init
+++ b/debian/init
@@ -33,7 +33,7 @@ start() {
 stop() {
   if [ ! -f "$PIDFILE" ] || ! kill -0 $(cat "$PIDFILE"); then
     echo 'Service not running' >&2
-    return 1
+    return 0
   fi
   echo -n 'Stopping service' >&2
   kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
diff --git a/rpm/SOURCES/mamonsu.init b/rpm/SOURCES/mamonsu.init
index 343f230a..6ea3aa13 100644
--- a/rpm/SOURCES/mamonsu.init
+++ b/rpm/SOURCES/mamonsu.init
@@ -23,7 +23,7 @@ RUNAS=mamonsu
 start() {
   if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
     echo 'Service already running' >&2
-    return 1
+    return 0
   fi
   echo -n 'Starting service' >&2
   su -c "$COMMAND" $RUNAS -s /bin/sh &