diff --git a/lib/rules/valid-v-else.js b/lib/rules/valid-v-else.js
index e54122377..b0a09cb28 100644
--- a/lib/rules/valid-v-else.js
+++ b/lib/rules/valid-v-else.js
@@ -36,7 +36,7 @@ module.exports = {
           context.report({
             node,
             loc: node.loc,
-            message: "'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."
+            message: "'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."
           })
         }
         if (utils.hasDirective(element, 'if')) {
diff --git a/tests/lib/rules/valid-v-else.js b/tests/lib/rules/valid-v-else.js
index 7d112a8c2..7825e4dfb 100644
--- a/tests/lib/rules/valid-v-else.js
+++ b/tests/lib/rules/valid-v-else.js
@@ -44,32 +44,32 @@ tester.run('valid-v-else', rule, {
     {
       filename: 'test.vue',
       code: '<template><template v-else><div></div></template></template>',
-      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."]
+      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."]
     },
     {
       filename: 'test.vue',
       code: '<template><div v-else></div></template>',
-      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."]
+      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."]
     },
     {
       filename: 'test.vue',
       code: '<template><div><div v-else></div></div></template>',
-      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."]
+      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."]
     },
     {
       filename: 'test.vue',
       code: '<template><div><div></div><div v-else></div></div></template>',
-      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."]
+      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."]
     },
     {
       filename: 'test.vue',
       code: '<template><div><div if="foo"></div><div v-else></div></div></template>',
-      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."]
+      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."]
     },
     {
       filename: 'test.vue',
       code: '<template><div><div v-if="foo"></div><div></div><div v-else></div></div></template>',
-      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else' directive."]
+      errors: ["'v-else' directives require being preceded by the element which has a 'v-if' or 'v-else-if' directive."]
     },
     {
       filename: 'test.vue',