diff --git a/deb/version_test.go b/deb/version_test.go
index 6a366324..3e4b8aad 100644
--- a/deb/version_test.go
+++ b/deb/version_test.go
@@ -78,6 +78,12 @@ func (s *VersionSuite) TestIsValidVersion(c *C) {
 	// valid upstream_version, but debian_revision contains a disallowed character
 	valid = isValidVersion("1.2.3-abc!")
 	c.Check(valid, Equals, false)
+
+	e, u, d = parseVersion("1.3-pre4-1")
+	c.Check([]string{e, u, d}, DeepEquals, []string{"", "1.3-pre4", "1"})
+
+	e, u, d = parseVersion("4:1.3-pre4-1")
+	c.Check([]string{e, u, d}, DeepEquals, []string{"4", "1.3-pre4", "1"})
 }
 
 func (s *VersionSuite) TestCompareLexicographic(c *C) {
@@ -169,6 +175,20 @@ func (s *VersionSuite) TestCompareVersions(c *C) {
 	check("1:abc~1.2.3-", "1:1.2.3~abc-good", 0, LeftInvalid)
 	check("1:1.2.3~abc-good", "1:abc~1.2.3-", 0, RightInvalid)
 	check("1:abc~1.2.3-", "2:def~4.5.6-", 0, BothInvalid)
+
+	c.Check(CompareVersions("5.2.0.3", "5.2.0.283"), Equals, -1)
+	c.Check(CompareVersions("4.3.5a", "4.3.5-rc3-1"), Equals, -1)
+	c.Check(CompareVersions("1.6.0-rc1+really1.6.0-0", "1.6.0-rc1-0"), Equals, 1)
+	c.Check(CompareVersions("1.2-3-4", "1.2-3-5"), Equals, -1)
+	c.Check(CompareVersions("1.0-1-1", "1.0-1"), Equals, 1)
+	c.Check(CompareVersions("1.0+1", "1.0"), Equals, 1)
+	c.Check(CompareVersions("1.0+a-1", "1.0-a-1"), Equals, -1)
+	c.Check(CompareVersions("1.0+1-1", "1.0-1"), Equals, 1)
+	c.Check(CompareVersions("1.0-1+b1", "1.0-1"), Equals, 1)
+	c.Check(CompareVersions("1.0-1+b1", "1.0-1~bpo1"), Equals, 1)
+	c.Check(CompareVersions("1.0-1+b2", "1.0-1+b10"), Equals, -1)
+	c.Check(CompareVersions("1.0.1+dfsg-1", "1.0.1-1"), Equals, 1)
+	c.Check(CompareVersions("1.0-1+b1", "1.0-2"), Equals, -1)
 }
 
 func (s *VersionSuite) TestParseDependency(c *C) {