diff --git a/snappy/remove.go b/snappy/remove.go
index 16eed86119..117745bdd2 100644
--- a/snappy/remove.go
+++ b/snappy/remove.go
@@ -10,6 +10,6 @@ func Remove(partName string) error {
 	if err := part.Uninstall(); err != nil {
 		return err
 	}
-	
+
 	return nil
 }
diff --git a/snappy/remove_test.go b/snappy/remove_test.go
new file mode 100644
index 0000000000..6806e520a7
--- /dev/null
+++ b/snappy/remove_test.go
@@ -0,0 +1,14 @@
+package snappy
+
+import (
+	"fmt"
+
+	. "launchpad.net/gocheck"
+)
+
+func (s *SnapTestSuite) TestRemoveNonExistingRaisesError(c *C) {
+	pkgName := "some-random-non-existing-stuff"
+	err := Remove(pkgName)
+	c.Assert(err, NotNil)
+	c.Assert(err.Error(), Equals, fmt.Sprintf("Can not find snap %s", pkgName))
+}