1 files changed, 18 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
index e1c8edfd60..f1576a9393 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
@@ -223,6 +223,10 @@ public class TB3TestSuite extends Suite {
             if (!baseClass.isAssignableFrom(c)) {
                 return;
             }
+            if (!includeInSuite(c)) {
+                return;
+            }
+
             if (!Modifier.isAbstract(c.getModifiers()) && !c.isAnonymousClass()) {
                 result.add((Class<? extends T>) c);
             }
@@ -235,4 +239,18 @@ public class TB3TestSuite extends Suite {
 
     }
 
+    /**
+     * @return true if the class should be included in the suite, false if not
+     */
+    private static boolean includeInSuite(Class<?> c) {
+        if (c.getAnnotation(ExcludeFromSuite.class) != null) {
+            return false;
+        }
+        if (c == Object.class) {
+            return true;
+        }
+
+        return includeInSuite(c.getSuperclass());
+    }
+
 }
\ No newline at end of file