diff --git a/container/state_test.go b/container/state_test.go
index 2a90e5541d..14f24600e0 100644
--- a/container/state_test.go
+++ b/container/state_test.go
@@ -166,3 +166,27 @@ func TestStateTimeoutWait(t *testing.T) {
 		}
 	}
 }
+
+func TestIsValidStateString(t *testing.T) {
+	states := []struct {
+		state    string
+		expected bool
+	}{
+		{"paused", true},
+		{"restarting", true},
+		{"running", true},
+		{"dead", true},
+		{"start", false},
+		{"created", true},
+		{"exited", true},
+		{"removing", true},
+		{"stop", false},
+	}
+
+	for _, s := range states {
+		v := IsValidStateString(s.state)
+		if v != s.expected {
+			t.Fatalf("Expected %t, but got %t", s.expected, v)
+		}
+	}
+}