diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ControlFlowUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ControlFlowUtils.java
index a09e2143f4ab..23ad190409c8 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ControlFlowUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ControlFlowUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2016 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -153,6 +153,7 @@ public class ControlFlowUtils {
     boolean hasDefaultCase = false;
     for (PsiStatement statement : statements) {
       if (statement instanceof PsiSwitchLabelStatement) {
+        numCases++;
         final PsiSwitchLabelStatement switchLabelStatement = (PsiSwitchLabelStatement)statement;
         if (switchLabelStatement.isDefaultCase()) {
           hasDefaultCase = true;
@@ -164,7 +165,6 @@ public class ControlFlowUtils {
           return true;
         }
       }
-      numCases++;
     }
     final boolean isEnum = isEnumSwitch(switchStatement);
     if (!hasDefaultCase && !isEnum) {
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/LoopStatementsThatDontLoopInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/LoopStatementsThatDontLoopInspection.java
deleted file mode 100644
index d0ed0405c972..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/LoopStatementsThatDontLoopInspection.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.siyeh.igtest.bugs;
-
-public class LoopStatementsThatDontLoopInspection
-{
-    private final int m_foo = 3;
-
-    public static void main(String[] args) throws Exception
-    {
-        new LoopStatementsThatDontLoopInspection().foo();
-    }
-
-    public LoopStatementsThatDontLoopInspection()
-    {
-    }
-
-    public static boolean isContainingHash( final String s )
-    {
-        final char[] c = s.toCharArray();
-
-        for( int i = 0; i < c.length; i++ )
-        {
-            switch( c[i] )
-            {
-                case '#':
-                    return false;
-            }
-        }
-
-        return true;
-    }
-       
-    private void foo() throws Exception
-    {
-        System.out.println("m_foo =" + m_foo);
-        for(; ;)
-        {
-            break;
-        }
-
-        while(true)
-        {
-            break;
-        }
-
-        do
-        {
-            break;
-        }
-        while(true);
-
-        while(true)
-        {
-            throw new Exception();
-        }
-
-       // for(; ;)
-        //{
-           // return;
-       // }
-
-    }
-
-}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/loop_statements_that_dont_loop/LoopStatementsThatDontLoop.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/loop_statements_that_dont_loop/LoopStatementsThatDontLoop.java
new file mode 100644
index 000000000000..a2c4ed98d3b0
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/loop_statements_that_dont_loop/LoopStatementsThatDontLoop.java
@@ -0,0 +1,90 @@
+package com.siyeh.igtest.bugs;
+
+import java.util.List;
+
+public class LoopStatementsThatDontLoop
+{
+    private final int m_foo = 3;
+
+    public static void main(String[] args) throws Exception
+    {
+        new LoopStatementsThatDontLoop().foo();
+    }
+
+    public LoopStatementsThatDontLoop()
+    {
+    }
+
+    public static boolean isContainingHash( final String s )
+    {
+        final char[] c = s.toCharArray();
+
+        for( int i = 0; i < c.length; i++ )
+        {
+            switch( c[i] )
+            {
+                case '#':
+                    return false;
+            }
+        }
+
+        return true;
+    }
+       
+    private void foo() throws Exception
+    {
+        System.out.println("m_foo =" + m_foo);
+        <warning descr="'for' statement does not loop">for</warning>(; ;)
+        {
+            break;
+        }
+
+        <warning descr="'while' statement does not loop">while</warning>(true)
+        {
+            break;
+        }
+
+        <warning descr="'do' statement does not loop">do</warning>
+        {
+            break;
+        }
+        while(true);
+
+        <warning descr="'while' statement does not loop">while</warning>(true)
+        {
+            throw new Exception();
+        }
+
+        <warning descr="'for' statement does not loop">for</warning>(<error descr="Unreachable statement">;</error> ;)
+        {
+            return;
+        }
+
+    }
+
+    enum Modification {
+        NONE, SET, REMOVE;
+    }
+
+    boolean foo(List<Modification> list){
+        for (Modification modification : list) {
+            switch (modification) {
+                case SET:
+                case REMOVE:
+                    return true;
+            }
+        }
+        <warning descr="'for' statement does not loop">for</warning> (Modification modification : list) {
+            switch (modification) {
+                case SET:
+                case REMOVE:
+                    return true;
+                case NONE:
+                    return false;
+            }
+
+        }
+        return false;
+    }
+
+}
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspectionTest.java
new file mode 100644
index 000000000000..d876b60d352c
--- /dev/null
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspectionTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ig.controlflow;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import com.siyeh.ig.LightInspectionTestCase;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class LoopStatementsThatDontLoopInspectionTest extends LightInspectionTestCase {
+
+  public void testLoopStatementsThatDontLoop() {
+    doTest();
+  }
+
+  @Nullable
+  @Override
+  protected InspectionProfileEntry getInspection() {
+    return new LoopStatementsThatDontLoopInspection();
+  }
+}