diff --git a/core/proc/shutdown_test.go b/core/proc/shutdown_test.go
new file mode 100644
index 00000000..3a0abcfd
--- /dev/null
+++ b/core/proc/shutdown_test.go
@@ -0,0 +1,28 @@
+package proc
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestShutdown(t *testing.T) {
+	SetTimeToForceQuit(time.Hour)
+	assert.Equal(t, time.Hour, delayTimeBeforeForceQuit)
+
+	var val int
+	called := AddWrapUpListener(func() {
+		val++
+	})
+	wrapUpListeners.notifyListeners()
+	called()
+	assert.Equal(t, 1, val)
+
+	called = AddShutdownListener(func() {
+		val += 2
+	})
+	shutdownListeners.notifyListeners()
+	called()
+	assert.Equal(t, 3, val)
+}
diff --git a/core/proc/stopper_test.go b/core/proc/stopper_test.go
new file mode 100644
index 00000000..6b168efc
--- /dev/null
+++ b/core/proc/stopper_test.go
@@ -0,0 +1,8 @@
+package proc
+
+import "testing"
+
+func TestNopStopper(t *testing.T) {
+	// no panic
+	noopStopper.Stop()
+}