diff --git a/service_aix.go b/service_aix.go
index 505c3ae..2563b75 100644
--- a/service_aix.go
+++ b/service_aix.go
@@ -1,4 +1,5 @@
-//+build aix
+//go:build aix
+// +build aix
 
 // Copyright 2015 Daniel Theophanes.
 // Use of this source code is governed by a zlib-style
diff --git a/service_go1.8.go b/service_go1.8.go
index 64bb0a9..c8f45fc 100644
--- a/service_go1.8.go
+++ b/service_go1.8.go
@@ -1,4 +1,5 @@
-//+build go1.8
+//go:build go1.8
+// +build go1.8
 
 package service
 
diff --git a/service_nosu_test.go b/service_nosu_test.go
index 97ee89d..2b92aef 100644
--- a/service_nosu_test.go
+++ b/service_nosu_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a zlib-style
 // license that can be found in the LICENSE file.
 
+//go:build !su
 // +build !su
 
 package service_test
diff --git a/service_systemd_linux.go b/service_systemd_linux.go
index 0b1b059..e9fb4d6 100644
--- a/service_systemd_linux.go
+++ b/service_systemd_linux.go
@@ -210,7 +210,7 @@ func (s *systemd) Uninstall() error {
 	if err := os.Remove(cp); err != nil {
 		return err
 	}
-	return nil
+	return s.run("daemon-reload")
 }
 
 func (s *systemd) Logger(errs chan<- error) (Logger, error) {
diff --git a/servicetest_unix_test.go b/servicetest_unix_test.go
index 1c174d7..c4b0b3d 100644
--- a/servicetest_unix_test.go
+++ b/servicetest_unix_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a zlib-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
 
 package service_test