diff --git a/conformance/04_management_test.go b/conformance/04_management_test.go
index 9c89a70e..78b7af6b 100644
--- a/conformance/04_management_test.go
+++ b/conformance/04_management_test.go
@@ -135,12 +135,16 @@ var test04ContentManagement = func() {
 					Equal(http.StatusNotFound),
 					Equal(http.StatusOK),
 				))
+				expectTags := numTags - 1
 				if resp.StatusCode() == http.StatusOK {
 					tagList := &TagList{}
 					jsonData := []byte(resp.String())
 					err = json.Unmarshal(jsonData, tagList)
 					Expect(err).To(BeNil())
-					Expect(len(tagList.Tags)).To(BeNumerically("<", numTags))
+					Expect(len(tagList.Tags)).To(Equal(expectTags))
+				}
+				if resp.StatusCode() == http.StatusNotFound {
+					Expect(expectTags).To(Equal(0))
 				}
 			})
 		})