diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java b/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java
index 1d061ae96599a..36625284d473b 100644
--- a/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java
+++ b/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java
@@ -113,6 +113,7 @@ public void testTemplateUpdate() throws Exception {
                 Settings.builder().put(TestPlugin.UPDATE_TEMPLATE_DUMMY_SETTING.getKey(), updateCount.incrementAndGet())
             ).get());
             List<IndexTemplateMetaData> templates = client().admin().indices().prepareGetTemplates("test_*").get().getIndexTemplates();
+            assertThat(templates, hasSize(3));
             boolean addedFound = false;
             boolean changedFound = false;
             boolean dummyFound = false;
@@ -140,7 +141,6 @@ public void testTemplateUpdate() throws Exception {
             assertTrue(addedFound);
             assertTrue(changedFound);
             assertTrue(dummyFound);
-            assertThat(templates.size(), equalTo(3));
         });
 
         // Wipe out all templates
@@ -161,6 +161,7 @@ private void assertTemplates() throws Exception {
             ).get());
 
             List<IndexTemplateMetaData> templates = client().admin().indices().prepareGetTemplates("test_*").get().getIndexTemplates();
+            assertThat(templates, hasSize(2));
             boolean addedFound = false;
             boolean changedFound = false;
             for (int i = 0; i < 2; i++) {
@@ -183,7 +184,6 @@ private void assertTemplates() throws Exception {
 
             assertTrue(addedFound);
             assertTrue(changedFound);
-            assertThat(templates, hasSize(2));
         });
     }