Unify test class naming.

Unit tests are now run for *Test.java and *Tests.java.

Change-Id: Iffff1d9a79c7c9b9317ffd19b5a46715b1442909

196 files changed, 281 insertions, 309 deletions

diff --git a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java b/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
index cb4f1f4068..36baa163cb 100644
--- a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
+++ b/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-public class ApplicationConnectionTestURLGeneration {
+public class ApplicationConnectionURLGenerationTest {
 
     private static final String[] URIS = new String[] {
             "http://demo.vaadin.com/", //
diff --git a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java b/client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
index cb70fc7a39..62b727e5f5 100644
--- a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
+++ b/client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
@@ -6,7 +6,7 @@ import org.junit.Assert;
 
 import com.vaadin.shared.VBrowserDetails;
 
-public class TestVBrowserDetailsUserAgentParser extends TestCase {
+public class VBrowserDetailsUserAgentParserTest extends TestCase {
 
     private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";
     private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12";
diff --git a/common.xml b/common.xml
index edd941c5e3..80a1cbf642 100644
--- a/common.xml
+++ b/common.xml
@@ -353,14 +353,8 @@
 
             <batchtest fork="yes" todir="${report.dir}">
                 <fileset dir="${test.src}">
-                    <exclude name="**/Abstract*" />
-                    <exclude name="**/Mock*" />
-                    <exclude name="com/vaadin/tests/data/bean/*" />
-                    <exclude name="com/vaadin/tests/util/*" />
-                    <exclude name="com/vaadin/benchmarks/*" />
-                    <exclude name="**/VaadinClasses.java" />
-                    <exclude name="**/*TestRunner.java" />
-                    <exclude name="**/SQLTestsConstants.java" />
+                    <include name="**/*Test.java" />
+                    <include name="**/*Tests.java" />
                 </fileset>
             </batchtest>
         </junit>
diff --git a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java b/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
index fd5d47b32f..ce76f8427b 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java
+++ b/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
@@ -25,7 +25,7 @@ import com.vaadin.data.util.BeanItem;
 import com.vaadin.ui.Field;
 import com.vaadin.ui.PopupDateField;
 
-public class FieldGroupDate {
+public class FieldGroupDateTest {
 
     private FieldGroup fieldGroup;
 
diff --git a/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTestBase.java
index 1e663afdd2..3d8f08a7ef 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTestBase.java
@@ -6,8 +6,8 @@ package com.vaadin.data.util;
  * Only a limited subset of the functionality is tested here, the rest in tests
  * of subclasses including {@link BeanItemContainer} and {@link BeanContainer}.
  */
-public abstract class AbstractBeanContainerTest extends
-        AbstractInMemoryContainerTest {
+public abstract class AbstractBeanContainerTestBase extends
+        AbstractInMemoryContainerTestBase {
 
     public static class Person {
         private String name;
@@ -34,7 +34,7 @@ public abstract class AbstractBeanContainerTest extends
 
         public ClassName(String fullyQualifiedName, Integer idNumber) {
             this.fullyQualifiedName = fullyQualifiedName;
-            simpleName = AbstractContainerTest
+            simpleName = AbstractContainerTestBase
                     .getSimpleName(fullyQualifiedName);
             reverseFullyQualifiedName = reverse(fullyQualifiedName);
             this.idNumber = idNumber;
diff --git a/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
index a443499a89..54cbc5305d 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
@@ -15,7 +15,7 @@ import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.filter.SimpleStringFilter;
 
-public abstract class AbstractContainerTest extends TestCase {
+public abstract class AbstractContainerTestBase extends TestCase {
 
     /**
      * Helper class for testing e.g. listeners expecting events to be fired.
diff --git a/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
index 772cd250ce..3bd00cce3c 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
@@ -7,8 +7,8 @@ import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 
-public abstract class AbstractHierarchicalContainerTest extends
-        AbstractContainerTest {
+public abstract class AbstractHierarchicalContainerTestBase extends
+        AbstractContainerTestBase {
 
     /**
      * @param container
diff --git a/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java
deleted file mode 100644
index bbad33c5bc..0000000000
--- a/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.vaadin.data.util;
-
-public abstract class AbstractInMemoryContainerTest extends
-        AbstractContainerTest {
-
-}
diff --git a/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
new file mode 100644
index 0000000000..d2c1a17bf8
--- /dev/null
+++ b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
@@ -0,0 +1,6 @@
+package com.vaadin.data.util;
+
+public abstract class AbstractInMemoryContainerTestBase extends
+        AbstractContainerTestBase {
+
+}
diff --git a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
index f22ab8478e..3d755f4397 100644
--- a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
@@ -13,7 +13,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver;
 
-public class BeanContainerTest extends AbstractBeanContainerTest {
+public class BeanContainerTest extends AbstractBeanContainerTestBase {
 
     protected static class PersonNameResolver implements
             BeanIdResolver<String, Person> {
@@ -345,7 +345,7 @@ public class BeanContainerTest extends AbstractBeanContainerTest {
                 Person.class);
         // resolver that returns null as item id
         container
-                .setBeanIdResolver(new BeanIdResolver<String, AbstractBeanContainerTest.Person>() {
+                .setBeanIdResolver(new BeanIdResolver<String, AbstractBeanContainerTestBase.Person>() {
 
                     @Override
                     public String getIdForBean(Person bean) {
diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java
index 7400f0efcf..a5bdcc7cf9 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java
@@ -3,9 +3,6 @@ package com.vaadin.data.util;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.junit.Ignore;
-
-@Ignore
 public class BeanItemContainerGenerator {
 
     public static class PortableRandom {
diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
index 514bf70416..8d2654b39b 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
@@ -19,7 +19,7 @@ import com.vaadin.data.util.NestedMethodPropertyTest.Address;
  * 
  * Most sorting related tests are in {@link BeanItemContainerSortTest}.
  */
-public class BeanItemContainerTest extends AbstractBeanContainerTest {
+public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
 
     // basics from the common container test
 
diff --git a/server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java b/server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
index ff6de50651..2fd21ef118 100644
--- a/server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
+++ b/server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
@@ -2,8 +2,8 @@ package com.vaadin.data.util;
 
 import java.util.Collection;
 
-public class TestContainerHierarchicalWrapper extends
-        AbstractHierarchicalContainerTest {
+public class ContainerHierarchicalWrapperTest extends
+        AbstractHierarchicalContainerTestBase {
 
     public void testBasicOperations() {
         testBasicContainerOperations(new ContainerHierarchicalWrapper(
diff --git a/server/tests/src/com/vaadin/data/util/TestContainerSorting.java b/server/tests/src/com/vaadin/data/util/ContainerSortingTest.java
index 497699605a..dd713dd7b0 100644
--- a/server/tests/src/com/vaadin/data/util/TestContainerSorting.java
+++ b/server/tests/src/com/vaadin/data/util/ContainerSortingTest.java
@@ -10,7 +10,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.tests.util.TestUtil;
 
-public class TestContainerSorting extends TestCase {
+public class ContainerSortingTest extends TestCase {
 
     private static final String ITEM_DATA_MINUS2_NULL = "Data -2 null";
     private static final String ITEM_DATA_MINUS2 = "Data -2";
diff --git a/server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java b/server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java
index 2a336ffc1c..0b71b3dff9 100644
--- a/server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java
+++ b/server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java
@@ -3,8 +3,8 @@ package com.vaadin.data.util;
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 
-public class TestHierarchicalContainer extends
-        AbstractHierarchicalContainerTest {
+public class HierarchicalContainerTest extends
+        AbstractHierarchicalContainerTestBase {
 
     public void testBasicOperations() {
         testBasicContainerOperations(new HierarchicalContainer());
diff --git a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/IndexedContainerTest.java
index eacee7e301..2f64e7c797 100644
--- a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/IndexedContainerTest.java
@@ -6,7 +6,7 @@ import org.junit.Assert;
 
 import com.vaadin.data.Item;
 
-public class TestIndexedContainer extends AbstractInMemoryContainerTest {
+public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
 
     public void testBasicOperations() {
         testBasicContainerOperations(new IndexedContainer());
diff --git a/server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumption.java b/server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
index ce0711a29e..b4621b823a 100644
--- a/server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumption.java
+++ b/server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
  * @since 7.2
  * @author Vaadin Ltd
  */
-public class MethodPropertyMemoryConsumption {
+public class MethodPropertyMemoryConsumptionTest {
 
     @Test
     public void testSetArguments() throws NoSuchFieldException,
diff --git a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
index 1c49017bf1..042f260be8 100644
--- a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
@@ -10,7 +10,7 @@ import junit.framework.TestCase;
 
 import org.junit.Assert;
 
-public class PerformanceTestIndexedContainer extends TestCase {
+public class PerformanceTestIndexedContainerTest extends TestCase {
 
     private static final int REPEATS = 10;
     private final static int ITEMS = 50000;
diff --git a/server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperField.java b/server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
index dc828689a8..5f31150210 100644
--- a/server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperField.java
+++ b/server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
@@ -8,7 +8,7 @@ import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.ui.TextField;
 
-public class ReflectToolsGetSuperField {
+public class ReflectToolsGetSuperFieldTest {
 
     @Test
     public void getFieldFromSuperClass() {
diff --git a/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTestBase.java
index 96673ff608..ebd843fb53 100644
--- a/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTestBase.java
@@ -8,7 +8,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
-public abstract class AbstractFilterTest<FILTERTYPE extends Filter> extends
+public abstract class AbstractFilterTestBase<FILTERTYPE extends Filter> extends
         TestCase {
 
     protected static final String PROPERTY1 = "property1";
diff --git a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
index e5bc622e39..012d0ef0bc 100644
--- a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
@@ -6,7 +6,7 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 
-public class AndOrFilterTest extends AbstractFilterTest<AbstractJunctionFilter> {
+public class AndOrFilterTest extends AbstractFilterTestBase<AbstractJunctionFilter> {
 
     protected Item item1 = new BeanItem<Integer>(1);
     protected Item item2 = new BeanItem<Integer>(2);
diff --git a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
index 732a541c89..fc5ffb9b56 100644
--- a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
@@ -15,7 +15,7 @@ import com.vaadin.data.util.filter.Compare.GreaterOrEqual;
 import com.vaadin.data.util.filter.Compare.Less;
 import com.vaadin.data.util.filter.Compare.LessOrEqual;
 
-public class CompareFilterTest extends AbstractFilterTest<Compare> {
+public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
 
     protected Item itemNull;
     protected Item itemEmpty;
diff --git a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
index d3e959e069..953bf3cd65 100644
--- a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
@@ -7,7 +7,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
-public class IsNullFilterTest extends AbstractFilterTest<IsNull> {
+public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> {
 
     public void testIsNull() {
         Item item1 = new PropertysetItem();
diff --git a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
index 0fcbd26b8e..9ba5168ac9 100644
--- a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
@@ -22,7 +22,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
-public class LikeFilterTest extends AbstractFilterTest<Like> {
+public class LikeFilterTest extends AbstractFilterTestBase<Like> {
 
     protected Item item1 = new PropertysetItem();
     protected Item item2 = new PropertysetItem();
diff --git a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
index 966ffd3a6e..310b749ce2 100644
--- a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
@@ -6,7 +6,7 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 
-public class NotFilterTest extends AbstractFilterTest<Not> {
+public class NotFilterTest extends AbstractFilterTestBase<Not> {
 
     protected Item item1 = new BeanItem<Integer>(1);
     protected Item item2 = new BeanItem<Integer>(2);
diff --git a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index eb7dff6015..fcaff6f2c3 100644
--- a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
@@ -3,7 +3,7 @@ package com.vaadin.data.util.filter;
 import org.junit.Assert;
 
 public class SimpleStringFilterTest extends
-        AbstractFilterTest<SimpleStringFilter> {
+        AbstractFilterTestBase<SimpleStringFilter> {
 
     protected static TestItem<String, String> createTestItem() {
         return new TestItem<String, String>("abcde", "TeSt");
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index b76e3df10e..f6619a33b6 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
@@ -13,12 +13,6 @@ import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 
 public class DataGenerator {
 
-    @Test
-    public void testDummy() {
-        // Added dummy test so JUnit will not complain about
-        // "No runnable methods".
-    }
-
     public static void addPeopleToDatabase(JDBCConnectionPool connectionPool)
             throws SQLException {
         Connection conn = connectionPool.reserveConnection();
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index e30ff8f5da..288cb65fae 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
@@ -11,12 +11,6 @@ import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 public class FreeformQueryUtil {
 
-    @Test
-    public void testDummy() {
-        // Added dummy test so JUnit will not complain about
-        // "No runnable methods".
-    }
-
     public static StatementHelper getQueryWithFilters(List<Filter> filters,
             int offset, int limit) {
         StatementHelper sh = new StatementHelper();
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 324899e373..1c70c8dad7 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
@@ -12,12 +12,6 @@ import org.junit.Test;
 public class MockInitialContextFactory implements InitialContextFactory {
     private static Context mockCtx = null;
 
-    @Test
-    public void testDummy() {
-        // Added dummy test so JUnit will not complain about
-        // "No runnable methods".
-    }
-
     public static void setMockContext(Context ctx) {
         mockCtx = ctx;
     }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java b/server/tests/src/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
index 64b06f651e..83b4abad3f 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
@@ -29,7 +29,7 @@ import com.vaadin.tests.data.bean.AnotherTestEnum;
 import com.vaadin.tests.data.bean.TestEnum;
 import com.vaadin.ui.TextField;
 
-public class TestAnyEnumToStringConverter {
+public class AnyEnumToStringConverterTest {
 
     public class AnyEnumToStringConverter implements Converter<Enum, String> {
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java
index 32c9dc6604..a61c0c9986 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java
@@ -25,7 +25,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.TextField;
 
-public class ConverterFactory extends TestCase {
+public class ConverterFactoryTest extends TestCase {
 
     public static class ConvertTo42 implements Converter<String, Integer> {
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestDateToLongConverter.java b/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
index 6b9fa93e27..d767430cc1 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestDateToLongConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.DateToLongConverter;
 
-public class TestDateToLongConverter extends TestCase {
+public class DateToLongConverterTest extends TestCase {
 
     DateToLongConverter converter = new DateToLongConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java b/server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
index d591d10e18..46dca6d13e 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.DateToSqlDateConverter;
 
-public class TestDateToSqlDateConverter extends TestCase {
+public class DateToSqlDateConverterTest extends TestCase {
 
     DateToSqlDateConverter converter = new DateToSqlDateConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestDefaultConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
index e1becf43e1..047ed8a79f 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestDefaultConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 
 import com.vaadin.data.util.converter.DefaultConverterFactory;
 
-public class TestDefaultConverterFactory {
+public class DefaultConverterFactoryTest {
 
     private DefaultConverterFactory factory = new DefaultConverterFactory();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java b/server/tests/src/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
index 75c742775f..377998db1e 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
@@ -29,7 +29,7 @@ import com.vaadin.tests.data.bean.AnotherTestEnum;
 import com.vaadin.tests.data.bean.TestEnum;
 import com.vaadin.ui.TextField;
 
-public class TestSpecificEnumToStringConverter {
+public class SpecificEnumToStringConverterTest {
 
     public class SpecificEnumToStringConverter implements
             Converter<Enum, String> {
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBigDecimalConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
index b8e74c7572..06d407c9f4 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBigDecimalConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToBigDecimalConverter;
 
-public class TestStringToBigDecimalConverter extends TestCase {
+public class StringToBigDecimalConverterTest extends TestCase {
 
     StringToBigDecimalConverter converter = new StringToBigDecimalConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBigIntegerConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
index 8d493609fe..057017790d 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBigIntegerConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToBigIntegerConverter;
 
-public class TestStringToBigIntegerConverter extends TestCase {
+public class StringToBigIntegerConverterTest extends TestCase {
 
     StringToBigIntegerConverter converter = new StringToBigIntegerConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
index 7be922a63a..f734d76633 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToBooleanConverter;
 
-public class TestStringToBooleanConverter extends TestCase {
+public class StringToBooleanConverterTest extends TestCase {
 
     StringToBooleanConverter converter = new StringToBooleanConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToByteConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java
index 19a68fbfdb..3859d03cc3 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToByteConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java
@@ -9,7 +9,7 @@ import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToByteConverter;
 
-public class TestStringToByteConverter extends TestCase {
+public class StringToByteConverterTest extends TestCase {
 
     StringToByteConverter converter = new StringToByteConverter();
     Converter<Byte, String> reverseConverter = new ReverseConverter<Byte, String>(
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java
index eb0e1461b2..16008d89c2 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToDateConverter;
 
-public class TestStringToDateConverter extends TestCase {
+public class StringToDateConverterTest extends TestCase {
 
     StringToDateConverter converter = new StringToDateConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
index 14691bd922..7054587009 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToDoubleConverter;
 
-public class TestStringToDoubleConverter extends TestCase {
+public class StringToDoubleConverterTest extends TestCase {
 
     StringToDoubleConverter converter = new StringToDoubleConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToEnumConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToEnumConverterTest.java
index 5dc24ca43a..a4c3732e1f 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToEnumConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToEnumConverterTest.java
@@ -7,7 +7,7 @@ import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToEnumConverter;
 
-public class TestStringToEnumConverter extends TestCase {
+public class StringToEnumConverterTest extends TestCase {
 
     public static enum FooEnum {
         VALUE1, SOME_VALUE, FOO_BAR_BAZ, Bar, nonStandardCase, _HUGH;
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
index 6721a92b1a..86319e641c 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToFloatConverter;
 
-public class TestStringToFloatConverter extends TestCase {
+public class StringToFloatConverterTest extends TestCase {
 
     StringToFloatConverter converter = new StringToFloatConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
index e810106631..0076f2c9d1 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 
-public class TestStringToIntegerConverter extends TestCase {
+public class StringToIntegerConverterTest extends TestCase {
 
     StringToIntegerConverter converter = new StringToIntegerConverter();
 
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java
index 0e95975c17..989dbcbbf5 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java
@@ -10,7 +10,7 @@ import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToLongConverter;
 
-public class TestStringToLongConverter extends TestCase {
+public class StringToLongConverterTest extends TestCase {
 
     StringToLongConverter converter = new StringToLongConverter();
     Converter<Long, String> reverseConverter = new ReverseConverter<Long, String>(
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToShortConverter.java b/server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java
index 542c580025..ab255bce80 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToShortConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java
@@ -9,7 +9,7 @@ import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToShortConverter;
 
-public class TestStringToShortConverter extends TestCase {
+public class StringToShortConverterTest extends TestCase {
 
     StringToShortConverter converter = new StringToShortConverter();
     Converter<Short, String> reverseConverter = new ReverseConverter<Short, String>(
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestBigDecimalRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
index 2ce576fb77..36f120151b 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestBigDecimalRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.BigDecimalRangeValidator;
 
-public class TestBigDecimalRangeValidator extends TestCase {
+public class BigDecimalRangeValidatorTest extends TestCase {
 
     private BigDecimalRangeValidator cleanValidator = new BigDecimalRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestBigIntegerRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
index d3263df6d2..92fabbb02a 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestBigIntegerRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.BigIntegerRangeValidator;
 
-public class TestBigIntegerRangeValidator extends TestCase {
+public class BigIntegerRangeValidatorTest extends TestCase {
 
     private BigIntegerRangeValidator cleanValidator = new BigIntegerRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestByteRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
index 6fac06c31b..03f35fe1bb 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestByteRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.ByteRangeValidator;
 
-public class TestByteRangeValidator extends TestCase {
+public class ByteRangeValidatorTest extends TestCase {
 
     private ByteRangeValidator cleanValidator = new ByteRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestCompositeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java
index 1d69c77a3d..8199419b67 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestCompositeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java
@@ -8,7 +8,7 @@ import com.vaadin.data.validator.CompositeValidator.CombinationMode;
 import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.RegexpValidator;
 
-public class TestCompositeValidator extends TestCase {
+public class CompositeValidatorTest extends TestCase {
 
     CompositeValidator and = new CompositeValidator(CombinationMode.AND,
             "One validator not valid");
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestDateRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
index cdb1e12545..7bb3e20160 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestDateRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
@@ -10,7 +10,7 @@ import junit.framework.TestCase;
 import com.vaadin.data.validator.DateRangeValidator;
 import com.vaadin.shared.ui.datefield.Resolution;
 
-public class TestDateRangeValidator extends TestCase {
+public class DateRangeValidatorTest extends TestCase {
     Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
             Locale.ENGLISH);
     Calendar endDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestDoubleRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
index 3fe61e13f4..b096937bd2 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestDoubleRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.DoubleRangeValidator;
 
-public class TestDoubleRangeValidator extends TestCase {
+public class DoubleRangeValidatorTest extends TestCase {
 
     private DoubleRangeValidator cleanValidator = new DoubleRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestEmailValidator.java b/server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java
index 7644b4738c..19fe9e6580 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestEmailValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.EmailValidator;
 
-public class TestEmailValidator extends TestCase {
+public class EmailValidatorTest extends TestCase {
 
     private EmailValidator validator = new EmailValidator("Error");
 
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestFloatRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
index 8de363e3d7..c5a07be43f 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestFloatRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.FloatRangeValidator;
 
-public class TestFloatRangeValidator extends TestCase {
+public class FloatRangeValidatorTest extends TestCase {
 
     private FloatRangeValidator cleanValidator = new FloatRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestIntegerRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
index 864fc61ab6..5e64d0107e 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestIntegerRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.IntegerRangeValidator;
 
-public class TestIntegerRangeValidator extends TestCase {
+public class IntegerRangeValidatorTest extends TestCase {
 
     private IntegerRangeValidator cleanValidator = new IntegerRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestLongRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
index a9aeb6b67b..440e9c3fd2 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestLongRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.LongRangeValidator;
 
-public class TestLongRangeValidator extends TestCase {
+public class LongRangeValidatorTest extends TestCase {
 
     private LongRangeValidator cleanValidator = new LongRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestNullValidator.java b/server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java
index 0a0634ec8f..1e08ea7e2c 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestNullValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.data.Validator;
 import com.vaadin.data.validator.NullValidator;
 
-public class TestNullValidator extends TestCase {
+public class NullValidatorTest extends TestCase {
 
     NullValidator notNull = new NullValidator("Null not accepted", false);
     NullValidator onlyNull = new NullValidator("Only null accepted", true);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestRegexpValidator.java b/server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java
index bcff224451..2a62d23059 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestRegexpValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.RegexpValidator;
 
-public class TestRegexpValidator extends TestCase {
+public class RegexpValidatorTest extends TestCase {
 
     private RegexpValidator completeValidator = new RegexpValidator("pattern",
             true, "Complete match validator error");
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestShortRangeValidator.java b/server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
index b522abb179..69d22eb91e 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestShortRangeValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.ShortRangeValidator;
 
-public class TestShortRangeValidator extends TestCase {
+public class ShortRangeValidatorTest extends TestCase {
 
     private ShortRangeValidator cleanValidator = new ShortRangeValidator(
             "no values", null, null);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/TestStringLengthValidator.java b/server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
index 6b4b2b0d51..5f12367f09 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/TestStringLengthValidator.java
+++ b/server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.StringLengthValidator;
 
-public class TestStringLengthValidator extends TestCase {
+public class StringLengthValidatorTest extends TestCase {
 
     private StringLengthValidator validator = new StringLengthValidator("Error");
     private StringLengthValidator validatorNoNull = new StringLengthValidator(
diff --git a/server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java b/server/tests/src/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
index 0d8433d1c6..b9b4f8025d 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Container.PropertySetChangeEvent;
 import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractBeanContainerListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractBeanContainerListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(BeanItemContainer.class,
                 PropertySetChangeEvent.class, PropertySetChangeListener.class,
diff --git a/server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java b/server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java
index b63e4f809a..a5c7dc3ab2 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java
@@ -5,9 +5,9 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Container.PropertySetChangeEvent;
 import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractContainerListeners extends AbstractListenerMethodsTest {
+public class AbstractContainerListenersTest extends AbstractListenerMethodsTestBase {
 
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
diff --git a/server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java b/server/tests/src/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
index a8e2a4aa2a..072998b8e1 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractInMemoryContainerListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractInMemoryContainerListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 ItemSetChangeEvent.class, ItemSetChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java b/server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java
index a1d01d1930..28e6f7e0a5 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java
@@ -6,9 +6,9 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.AbstractProperty;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractPropertyListeners extends AbstractListenerMethodsTest {
+public class AbstractPropertyListenersTest extends AbstractListenerMethodsTestBase {
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(AbstractProperty.class,
                 ValueChangeEvent.class, ValueChangeListener.class,
diff --git a/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java b/server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java
index 7e120cb9dd..087a7fb0f5 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java
+++ b/server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java
@@ -18,7 +18,7 @@ package com.vaadin.tests.server;
 
 import junit.framework.TestCase;
 
-public class TestAssertionsEnabled extends TestCase {
+public class AssertionsEnabledTest extends TestCase {
     public void testAssertionsEnabled() {
         boolean assertFailed = false;
         try {
diff --git a/server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java b/server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java
index 3d37022b81..90a0283cda 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java
+++ b/server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java
@@ -6,7 +6,7 @@ import org.atmosphere.util.Version;
 
 import com.vaadin.server.Constants;
 
-public class TestAtmosphereVersion extends TestCase {
+public class AtmosphereVersionTest extends TestCase {
     /**
      * Test that the atmosphere version constant matches the version on our
      * classpath
diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
index 83269ede28..6e7b778f78 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
@@ -19,7 +19,7 @@ import junit.framework.TestCase;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class TestClassesSerializable extends TestCase {
+public class ClassesSerializableTest extends TestCase {
 
     /**
      * JARs that will be scanned for classes to test, in addition to classpath
@@ -63,6 +63,10 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.buildhelpers.*", //
             "com\\.vaadin\\.util\\.ReflectTools.*", //
             "com\\.vaadin\\.data\\.util\\.ReflectTools.*", //
+            "com\\.vaadin\\.data\\.util.BeanItemContainerGenerator.*",
+            "com\\.vaadin\\.data\\.util\\.sqlcontainer\\.connection\\.MockInitialContextFactory",
+            "com\\.vaadin\\.data\\.util\\.sqlcontainer\\.DataGenerator",
+            "com\\.vaadin\\.data\\.util\\.sqlcontainer\\.FreeformQueryUtil",
             "com\\.vaadin\\.sass.*", //
             "com\\.vaadin\\.testbench.*", //
             "com\\.vaadin\\.util\\.CurrentInstance\\$1", //
@@ -149,11 +153,6 @@ public class TestClassesSerializable extends TestCase {
     }
 
     private boolean isTestClass(Class<?> cls) {
-        // @Ignore is used on test util classes
-        if (cls.isAnnotationPresent(Ignore.class)) {
-            return true;
-        }
-
         if (cls.getEnclosingClass() != null
                 && isTestClass(cls.getEnclosingClass())) {
             return true;
diff --git a/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java b/server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java
index d6a71028db..da6bc76a0f 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java
@@ -33,18 +33,18 @@ import elemental.json.Json;
 import elemental.json.JsonArray;
 import elemental.json.impl.JsonUtil;
 
-public class TestClientMethodSerialization extends TestCase {
+public class ClientMethodSerializationTest extends TestCase {
 
     private static final Method JAVASCRIPT_CALLBACK_METHOD = ReflectTools
             .findMethod(JavaScriptCallbackRpc.class, "call", String.class,
                     JsonArray.class);
 
     private static final Method BASIC_PARAMS_CALL_METHOD = ReflectTools
-            .findMethod(TestClientMethodSerialization.class,
+            .findMethod(ClientMethodSerializationTest.class,
                     "basicParamsMethodForTesting", String.class, Integer.class);
 
     private static final Method NO_PARAMS_CALL_METHOD = ReflectTools
-            .findMethod(TestClientMethodSerialization.class,
+            .findMethod(ClientMethodSerializationTest.class,
                     "noParamsMethodForTesting");
 
     public void basicParamsMethodForTesting(String stringParam,
diff --git a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java
index b127ffe7e5..18fbf70a2a 100644
--- a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java
+++ b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java
@@ -47,7 +47,7 @@ import elemental.json.JsonException;
  * @since
  * @author Vaadin Ltd
  */
-public class CsrfTokenMissingTestServer {
+public class CsrfTokenMissingTest {
 
     // Dummy fields just to run the test.
     private VaadinServlet mockServlet;
@@ -185,7 +185,7 @@ public class CsrfTokenMissingTestServer {
     }
 
     private static Logger LOGGER = Logger
-            .getLogger(CsrfTokenMissingTestServer.class.getName());
+            .getLogger(CsrfTokenMissingTest.class.getName());
     static {
         LOGGER.setLevel(Level.ALL);
     }
diff --git a/server/tests/src/com/vaadin/tests/server/TestEventRouter.java b/server/tests/src/com/vaadin/tests/server/EventRouterTest.java
index a8f5039042..67f39d301d 100644
--- a/server/tests/src/com/vaadin/tests/server/TestEventRouter.java
+++ b/server/tests/src/com/vaadin/tests/server/EventRouterTest.java
@@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.TextField;
 
-public class TestEventRouter extends TestCase {
+public class EventRouterTest extends TestCase {
 
     int innerListenerCalls = 0;
 
diff --git a/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java b/server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java
index 413926c89a..3c68e86afa 100644
--- a/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
+++ b/server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java
@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.util.FileTypeResolver;
 
-public class TestFileTypeResolver extends TestCase {
+public class FileTypeResolverTest extends TestCase {
 
     private static final String FLASH_MIME_TYPE = "application/x-shockwave-flash";
     private static final String TEXT_MIME_TYPE = "text/plain";
diff --git a/server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java b/server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java
index 8334c7f183..2e1fa83540 100644
--- a/server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java
@@ -5,9 +5,9 @@ import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class IndexedContainerListeners extends AbstractListenerMethodsTest {
+public class IndexedContainerListenersTest extends AbstractListenerMethodsTestBase {
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 ValueChangeEvent.class, ValueChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/TestKeyMapper.java b/server/tests/src/com/vaadin/tests/server/KeyMapperTest.java
index 1c1f9624c8..d632e65c9f 100644
--- a/server/tests/src/com/vaadin/tests/server/TestKeyMapper.java
+++ b/server/tests/src/com/vaadin/tests/server/KeyMapperTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.server.KeyMapper;
 
-public class TestKeyMapper extends TestCase {
+public class KeyMapperTest extends TestCase {
 
     public void testAdd() {
         KeyMapper<Object> mapper = new KeyMapper<Object>();
diff --git a/server/tests/src/com/vaadin/tests/server/TestMimeTypes.java b/server/tests/src/com/vaadin/tests/server/MimeTypesTest.java
index 12e5b09632..36007fae17 100644
--- a/server/tests/src/com/vaadin/tests/server/TestMimeTypes.java
+++ b/server/tests/src/com/vaadin/tests/server/MimeTypesTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.server.ClassResource;
 import com.vaadin.ui.Embedded;
 
-public class TestMimeTypes extends TestCase {
+public class MimeTypesTest extends TestCase {
 
     public void testEmbeddedPDF() {
         Embedded e = new Embedded("A pdf", new ClassResource("file.pddf"));
diff --git a/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java
index b47a2953ce..6563556a4e 100644
--- a/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java
+++ b/server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java
@@ -10,7 +10,7 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertyFormatter;
 
 @SuppressWarnings("unchecked")
-public class TestPropertyFormatter extends TestCase {
+public class PropertyFormatterTest extends TestCase {
 
     class TestFormatter extends PropertyFormatter {
 
diff --git a/server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java b/server/tests/src/com/vaadin/tests/server/PropertysetItemListenersTest.java
index d493f22779..7edaa2826a 100644
--- a/server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/PropertysetItemListenersTest.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Item.PropertySetChangeEvent;
 import com.vaadin.data.Item.PropertySetChangeListener;
 import com.vaadin.data.util.PropertysetItem;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class PropertysetItemListeners extends AbstractListenerMethodsTest {
+public class PropertysetItemListenersTest extends AbstractListenerMethodsTestBase {
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(PropertysetItem.class,
                 PropertySetChangeEvent.class, PropertySetChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/TestSerialization.java b/server/tests/src/com/vaadin/tests/server/SerializationTest.java
index 3c18035dab..4de30e579e 100644
--- a/server/tests/src/com/vaadin/tests/server/TestSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/SerializationTest.java
@@ -17,7 +17,7 @@ import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Form;
 
-public class TestSerialization extends TestCase {
+public class SerializationTest extends TestCase {
 
     public void testValidators() throws Exception {
         RegexpValidator validator = new RegexpValidator(".*", "Error");
diff --git a/server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java b/server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
index 6907594b5e..04e621d5d2 100644
--- a/server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
+++ b/server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
@@ -9,7 +9,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.server.communication.FileUploadHandler.SimpleMultiPartInputStream;
 
-public class TestSimpleMultiPartInputStream extends TestCase {
+public class SimpleMultiPartInputStreamTest extends TestCase {
 
     /**
      * Check that the output for a given stream until boundary is as expected.
diff --git a/server/tests/src/com/vaadin/tests/server/TestStreamResource.java b/server/tests/src/com/vaadin/tests/server/StreamResourceTest.java
index 0fdcc9e39c..4971f556db 100644
--- a/server/tests/src/com/vaadin/tests/server/TestStreamResource.java
+++ b/server/tests/src/com/vaadin/tests/server/StreamResourceTest.java
@@ -26,7 +26,7 @@ import com.vaadin.server.StreamResource.StreamSource;
  * 
  * @author Vaadin Ltd
  */
-public class TestStreamResource {
+public class StreamResourceTest {
 
     @Test
     public void testEqualsWithNullFields() {
diff --git a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java b/server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java
index b2faca1ed6..e15e722199 100644
--- a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java
@@ -17,7 +17,7 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 
-public class TestStreamVariableMapping extends TestCase {
+public class StreamVariableMappingTest extends TestCase {
     private static final String variableName = "myName";
 
     private Upload owner;
diff --git a/server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListeners.java b/server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java
index bd7053af40..68964dbfd1 100644
--- a/server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java
@@ -25,7 +25,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.UI;
 
-public class AttachDetachListeners {
+public class AttachDetachListenersTest {
 
     private IMocksControl control;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java b/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
index e189ffc77d..ec3754d037 100644
--- a/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
@@ -14,7 +14,7 @@ import org.junit.Assert;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.ui.Component;
 
-public abstract class AbstractListenerMethodsTest extends TestCase {
+public abstract class AbstractListenerMethodsTestBase extends TestCase {
 
     public static void main(String[] args) {
         findAllListenerMethods();
@@ -48,13 +48,13 @@ public abstract class AbstractListenerMethodsTest extends TestCase {
                         System.out.println("package " + packageName + ";");
 
                         System.out.println("import "
-                                + AbstractListenerMethodsTest.class.getName()
+                                + AbstractListenerMethodsTestBase.class.getName()
                                 + ";");
                         System.out.println("import " + c.getName() + ";");
                         System.out.println("public class "
                                 + c.getSimpleName()
                                 + "Listeners extends "
-                                + AbstractListenerMethodsTest.class
+                                + AbstractListenerMethodsTestBase.class
                                         .getSimpleName() + " {");
                     }
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/TestReadEmptyDesign.java b/server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
index ecd303b678..5cf3b9700e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/TestReadEmptyDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
@@ -34,7 +34,7 @@ import com.vaadin.ui.declarative.DesignException;
  * Test cases for checking that reading a design with no elements in the html
  * body produces null as the root component.
  */
-public class TestReadEmptyDesign extends TestCase {
+public class ReadEmptyDesignTest extends TestCase {
     InputStream is;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirty.java b/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
index 280d638707..da4d8a92d4 100644
--- a/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirty.java
+++ b/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
@@ -17,7 +17,7 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
-public class StateGetDoesNotMarkDirty extends TestCase {
+public class StateGetDoesNotMarkDirtyTest extends TestCase {
 
     private Set<String> excludedMethods = new HashSet<String>();
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/TestWriteEmptyDesign.java b/server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
index b50915f1fd..a535de2b24 100644
--- a/server/tests/src/com/vaadin/tests/server/component/TestWriteEmptyDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * Test cases for checking that writing a component hierarchy with null root
  * produces an html document that has no elements in the html body.
  */
-public class TestWriteEmptyDesign extends TestCase {
+public class WriteEmptyDesignTest extends TestCase {
 
     public void testWriteComponent() throws IOException {
         OutputStream os = new ByteArrayOutputStream();
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java
index 7d6db42d1a..062a89ad62 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.absolutelayout;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.AbsoluteLayout;
 
-public class AbsoluteLayoutListeners extends AbstractListenerMethodsTest {
+public class AbsoluteLayoutListenersTest extends AbstractListenerMethodsTestBase {
     public void testLayoutClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(AbsoluteLayout.class, LayoutClickEvent.class,
                 LayoutClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java
index d76dcffa2f..eac7ff4d8a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java
@@ -7,7 +7,7 @@ import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 
-public class ComponentPosition extends TestCase {
+public class ComponentPositionTest extends TestCase {
 
     private static final String CSS = "top:7.0px;right:7.0%;bottom:7.0pc;left:7.0em;z-index:7;";
     private static final String PARTIAL_CSS = "top:7.0px;left:7.0em;";
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ReadDesignTest.java
index f8af0a992e..f17e1ada44 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ReadDesignTest.java
@@ -35,7 +35,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private AbsoluteLayout root;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/WriteDesignTest.java
index 5f42b1fa81..39a2207819 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/WriteDesignTest.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     public void testSynchronizeEmptyLayout() {
         AbsoluteLayout layout = createTestLayout();
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java
index 1903e66f92..18eb79aadc 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.ui.AbstractComponent;
 
-public class TestAbstractComponentStyleNames extends TestCase {
+public class AbstractComponentStyleNamesTest extends TestCase {
 
     public void testSetMultiple() {
         AbstractComponent component = getComponent();
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/ReadDesignTest.java
index 43a050ba80..79979e03d9 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/ReadDesignTest.java
@@ -36,7 +36,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/WriteDesignTest.java
index 7f207a25ae..68b7a46cde 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/WriteDesignTest.java
@@ -42,7 +42,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java
index 9763354b57..3a2150b700 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.server.component.abstractcomponentcontainer;
 
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.HasComponents.ComponentAttachEvent;
 import com.vaadin.ui.HasComponents.ComponentAttachListener;
 import com.vaadin.ui.HasComponents.ComponentDetachEvent;
@@ -8,8 +8,8 @@ import com.vaadin.ui.HasComponents.ComponentDetachListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestAbstractComponentContainerListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractComponentContainerListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testComponentDetachListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(HorizontalLayout.class,
                 ComponentDetachEvent.class, ComponentDetachListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChild.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
index 67e6d09adc..176d178112 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChild.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.HasComponents;
  * 
  * @author Vaadin Ltd
  */
-public class AddParentAsChild {
+public class AddParentAsChildTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testAddComponent() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidators.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
index 764446f7aa..61aafe317d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidators.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
@@ -8,7 +8,7 @@ import com.vaadin.data.Validator;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Field;
 
-public class AbsFieldValidators extends TestCase {
+public class AbsFieldValidatorsTest extends TestCase {
 
     Field<Object> field = new AbstractField<Object>() {
         @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
index 887f1b8ff3..02aa6afe07 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
@@ -14,7 +14,7 @@ import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.ui.TextField;
 
-public class AbsFieldValueConversionError extends TestCase {
+public class AbsFieldValueConversionErrorTest extends TestCase {
 
     Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com",
             34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town",
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java
index beb32e7dba..94ff10926f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java
@@ -21,7 +21,7 @@ import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 
-public class AbsFieldValueConversions extends TestCase {
+public class AbsFieldValueConversionsTest extends TestCase {
 
     Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com",
             34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town",
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java
index 9937bf92d5..def3ceb643 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java
@@ -4,10 +4,10 @@ import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.CheckBox;
 
-public class TestAbstractFieldListeners extends AbstractListenerMethodsTest {
+public class AbstractFieldListenersTest extends AbstractListenerMethodsTestBase {
     public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(CheckBox.class,
                 ReadOnlyStatusChangeEvent.class,
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java
index 99397e9e8f..68e198c37a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java
@@ -14,7 +14,7 @@ import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.TextField;
 
-public class DefaultConverterFactory extends TestCase {
+public class DefaultConverterFactoryTest extends TestCase {
 
     public static class FloatBean {
         float f1;
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/ReadDesignTest.java
index dd0e629199..4fa3400af5 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/ReadDesignTest.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java
index f391d15fb3..f547f2c66b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java
@@ -13,7 +13,7 @@ import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.UI;
 
-public class RemoveListenersOnDetach {
+public class RemoveListenersOnDetachTest {
 
     int numValueChanges = 0;
     int numReadOnlyChanges = 0;
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/WriteDesignTest.java
index 969713abe6..37ff8cf3aa 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/WriteDesignTest.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java
index a0b34aca78..e7393e5f7d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.server.component.abstractorderedlayout;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestAbstractOrderedLayoutListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractOrderedLayoutListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testLayoutClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(VerticalLayout.class, LayoutClickEvent.class,
                 LayoutClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplace.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
index fd951f1692..9d1972c232 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplace.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
@@ -29,7 +29,7 @@ import com.vaadin.ui.Alignment;
  * @since 7.2
  * @author Vaadin Ltd
  */
-public class LayoutSettingsOnReplace {
+public class LayoutSettingsOnReplaceTest {
 
     @Test
     public void testExpandRatio() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/ReadDesignTest.java
index 874fbd83b2..b0a2e678c2 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/ReadDesignTest.java
@@ -32,7 +32,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     public void testChildCount() {
         VerticalLayout root = createLayout(0f, false);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/WriteDesignTest.java
index 302cf985bd..96697af3cd 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/WriteDesignTest.java
@@ -32,7 +32,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     public void testSynchronizeMargin() {
         VerticalLayout layout = new VerticalLayout();
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java
index 75c19b0517..8ec0414e03 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java
@@ -4,10 +4,10 @@ import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Container.PropertySetChangeEvent;
 import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.ComboBox;
 
-public class TestAbstractSelectListeners extends AbstractListenerMethodsTest {
+public class AbstractSelectListenersTest extends AbstractListenerMethodsTestBase {
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(ComboBox.class, ItemSetChangeEvent.class,
                 ItemSetChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/TestRemoveFromParentLocking.java b/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
index fd4a1df766..e277d4e075 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/TestRemoveFromParentLocking.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
@@ -26,7 +26,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestRemoveFromParentLocking {
+public class RemoveFromParentLockingTest {
 
     private static VerticalLayout createTestComponent() {
         VaadinSession session = new VaadinSession(null) {
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContent.java b/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
index dae0e57d02..b84794d58a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContent.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
@@ -29,7 +29,7 @@ import com.vaadin.ui.HasComponents;
  * 
  * @author Vaadin Ltd
  */
-public class SetParentAsContent {
+public class SetParentAsContentTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testSetContent() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java
index 2b6cdaa6cc..5dd2f406bc 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.server.component.abstractsplitpanel;
 
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent;
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener;
 import com.vaadin.ui.HorizontalSplitPanel;
 
-public class TestAbstractSplitPanelListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractSplitPanelListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testSplitterClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(HorizontalSplitPanel.class,
                 SplitterClickEvent.class, SplitterClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/ReadDesignTest.java
index db30f05c5f..f3a7e32e96 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/ReadDesignTest.java
@@ -38,7 +38,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
     DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/WriteDesignTest.java
index 649498c20b..a75fe911f8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/WriteDesignTest.java
@@ -32,7 +32,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
     private DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java
index 9868d6ebfd..1b7f4fdce1 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java
@@ -6,10 +6,10 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.TextField;
 
-public class TestAbstractTextFieldListeners extends AbstractListenerMethodsTest {
+public class AbstractTextFieldListenersTest extends AbstractListenerMethodsTestBase {
     public void testTextChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(TextField.class, TextChangeEvent.class,
                 TextChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/ReadDesignTest.java
index 3b4b6f1f03..2645ce4255 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/ReadDesignTest.java
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Test case for reading the attributes of the AbstractTextField from design
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/WriteDesignTest.java
index be5c384d3b..9b1129ce14 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/WriteDesignTest.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java b/server/tests/src/com/vaadin/tests/server/component/button/ButtonClickTest.java
index 3d5fe77f8e..6283ccf6af 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ButtonClickTest.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.UI;
 /**
  * Tests the public click() method.
  */
-public class ButtonClick {
+public class ButtonClickTest {
     private boolean clicked = false;
 
     @Test
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java b/server/tests/src/com/vaadin/tests/server/component/button/ButtonListenersTest.java
index dc37312eea..4478048b12 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ButtonListenersTest.java
@@ -4,12 +4,12 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 
-public class ButtonListeners extends AbstractListenerMethodsTest {
+public class ButtonListenersTest extends AbstractListenerMethodsTestBase {
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Button.class, FocusEvent.class,
                 FocusListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/button/ReadDesignTest.java
index e194232742..0e503b54b8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ReadDesignTest.java
@@ -37,7 +37,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * design.
  * 
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/button/WriteDesignTest.java
index dff80769f4..6d553da835 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/WriteDesignTest.java
@@ -32,7 +32,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * Tests generating html tree nodes corresponding to the contents of a Button
  * and a NativeButton.
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasics.java b/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
index 773631642a..95b4aecdb3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasics.java
+++ b/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
@@ -41,7 +41,7 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
 /**
  * Basic API tests for the calendar
  */
-public class CalendarBasics {
+public class CalendarBasicsTest {
 
     @Test
     public void testEmptyConstructorInitialization() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSource.java b/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
index 030abc0eb2..8a066497cd 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSource.java
+++ b/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.components.calendar.ContainerEventProvider;
 import com.vaadin.ui.components.calendar.event.BasicEvent;
 import com.vaadin.ui.components.calendar.event.CalendarEvent;
 
-public class ContainerDataSource extends TestCase {
+public class ContainerDataSourceTest extends TestCase {
 
     private Calendar calendar;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/checkbox/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/checkbox/ReadDesignTest.java
index c58b3b6bdd..9456fa4b31 100644
--- a/server/tests/src/com/vaadin/tests/server/component/checkbox/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/checkbox/ReadDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * Test cases for reading the contents of a Checkbox from a design.
  * 
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/checkbox/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/checkbox/WriteDesignTest.java
index d187371db6..4c41f67ac5 100644
--- a/server/tests/src/com/vaadin/tests/server/component/checkbox/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/checkbox/WriteDesignTest.java
@@ -26,7 +26,7 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Tests generating html tree nodes corresponding to the contents of a Checkbox
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversions.java b/server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
index 46d72a6ae6..8c05e58b9c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 
-public class ColorConversions {
+public class ColorConversionsTest {
 
     @Test
     public void convertHSL2RGB() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java
index ee75d6ed59..e000df593b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.csslayout;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.CssLayout;
 
-public class CssLayoutListeners extends AbstractListenerMethodsTest {
+public class CssLayoutListenersTest extends AbstractListenerMethodsTestBase {
     public void testLayoutClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(CssLayout.class, LayoutClickEvent.class,
                 LayoutClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/ReadDesignTest.java
index bac3dc70eb..5c3517fa56 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/ReadDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     public void testChildCount() {
         CssLayout root = createLayout();
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/WriteDesignTest.java
index d660eb77ec..0fdb1c8335 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/WriteDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     public void testSynchronizeEmptyLayout() {
         CssLayout layout = new CssLayout();
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java
index 0f4aee35c7..6d774366a9 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java
@@ -4,10 +4,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.DateField;
 
-public class DateFieldListeners extends AbstractListenerMethodsTest {
+public class DateFieldListenersTest extends AbstractListenerMethodsTestBase {
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(DateField.class, FocusEvent.class,
                 FocusListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java b/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java
index 7512f0f499..b41d5e9e13 100644
--- a/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.embedded;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Embedded;
 
-public class EmbeddedListeners extends AbstractListenerMethodsTest {
+public class EmbeddedListenersTest extends AbstractListenerMethodsTestBase {
     public void testClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Embedded.class, ClickEvent.class,
                 ClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBinding.java b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
index ea34d8b04e..cb29a84aa8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBinding.java
+++ b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
@@ -10,7 +10,7 @@ import com.vaadin.data.util.PropertysetItem;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.TextField;
 
-public class CaseInsensitiveBinding {
+public class CaseInsensitiveBindingTest {
 
     @Test
     public void caseInsensitivityAndUnderscoreRemoval() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescription.java b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
index 033f1458e8..029dcc66a3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescription.java
+++ b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
@@ -11,7 +11,7 @@ import com.vaadin.data.util.PropertysetItem;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.TextField;
 
-public class FieldNamedDescription {
+public class FieldNamedDescriptionTest {
 
     @Test
     public void bindReadOnlyPropertyToFieldGroup() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignment.java b/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java
index 244f1f9e45..9b6368474f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignment.java
+++ b/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TextField;
 
-public class DefaultAlignment {
+public class DefaultAlignmentTest {
 
     private GridLayout gridLayout;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java
index ce3a9faa65..ed18a24608 100644
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.gridlayout;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.GridLayout;
 
-public class GridLayoutListeners extends AbstractListenerMethodsTest {
+public class GridLayoutListenersTest extends AbstractListenerMethodsTestBase {
     public void testLayoutClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(GridLayout.class, LayoutClickEvent.class,
                 LayoutClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelConvertersTest.java
index e6cecee1bf..7e65e6a044 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelConvertersTest.java
@@ -24,7 +24,7 @@ import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.Label;
 
-public class LabelConverters extends TestCase {
+public class LabelConvertersTest extends TestCase {
 
     public void testLabelSetDataSourceLaterOn() {
         Person p = Person.createTestPerson1();
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelListenersTest.java
index 9bb4c53ba2..4287d58d9c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelListenersTest.java
@@ -10,11 +10,11 @@ import org.easymock.EasyMock;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Label.ValueChangeEvent;
 
-public class LabelListeners extends AbstractListenerMethodsTest {
+public class LabelListenersTest extends AbstractListenerMethodsTestBase {
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Label.class, ValueChangeEvent.class,
                 ValueChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/label/ReadDesignTest.java
index 3e577b5578..9ccaf43398 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/ReadDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * Test case for reading the contents of a Label from a design.
  * 
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/label/WriteDesignTest.java
index 3368a7d22e..3d13767d35 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/WriteDesignTest.java
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Tests generating an html tree node corresponding to a Label.
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java b/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java
index fd3e02994c..1c06d2652a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.loginform;
 
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.LoginForm;
 import com.vaadin.ui.LoginForm.LoginEvent;
 import com.vaadin.ui.LoginForm.LoginListener;
 
-public class LoginFormListeners extends AbstractListenerMethodsTest {
+public class LoginFormListenersTest extends AbstractListenerMethodsTestBase {
     public void testLoginListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(LoginForm.class, LoginEvent.class,
                 LoginListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java b/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java
index f304315ebc..68007bd870 100644
--- a/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java
+++ b/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
 
-public class MenuBarIds extends TestCase implements Command {
+public class MenuBarIdsTest extends TestCase implements Command {
 
     private MenuItem lastSelectedItem;
     private MenuItem menuFile;
diff --git a/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java b/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java
index 7eb35c3882..c2dc175c75 100644
--- a/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java
@@ -4,10 +4,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.OptionGroup;
 
-public class OptionGroupListeners extends AbstractListenerMethodsTest {
+public class OptionGroupListenersTest extends AbstractListenerMethodsTestBase {
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(OptionGroup.class, FocusEvent.class,
                 FocusListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignment.java b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java
index 9497a13c0a..7560c21adb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignment.java
+++ b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
-public class DefaultAlignment {
+public class DefaultAlignmentTest {
 
     private VerticalLayout verticalLayout;
     private HorizontalLayout horizontalLayout;
diff --git a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java
index 6a9d55d7e4..3b3dfb94d8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
+++ b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestOrderedLayout extends TestCase {
+public class OrderedLayoutTest extends TestCase {
 
     public void testVLIteration() {
         testIndexing(new VerticalLayout(), 10);
diff --git a/server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java b/server/tests/src/com/vaadin/tests/server/component/panel/PanelListenersTest.java
index 275e90f5d1..929553a682 100644
--- a/server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/panel/PanelListenersTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.panel;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Panel;
 
-public class PanelListeners extends AbstractListenerMethodsTest {
+public class PanelListenersTest extends AbstractListenerMethodsTestBase {
     public void testClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Panel.class, ClickEvent.class,
                 ClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/panel/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/panel/ReadDesignTest.java
index 3eb52309a8..41b19c9778 100644
--- a/server/tests/src/com/vaadin/tests/server/component/panel/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/panel/ReadDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignException;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
     DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/panel/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/panel/WriteDesignTest.java
index f81193d511..8b8c6e5e13 100644
--- a/server/tests/src/com/vaadin/tests/server/component/panel/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/panel/WriteDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
     Element panelElement;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java
index 12a5a0f520..06782818a8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.server.component.popupview;
 
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.PopupView;
 import com.vaadin.ui.PopupView.PopupVisibilityEvent;
 import com.vaadin.ui.PopupView.PopupVisibilityListener;
 
-public class PopupViewListeners extends AbstractListenerMethodsTest {
+public class PopupViewListenersTest extends AbstractListenerMethodsTestBase {
     public void testPopupVisibilityListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(PopupView.class, PopupVisibilityEvent.class,
                 PopupVisibilityListener.class, new PopupView("", new Label()));
diff --git a/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/select/SelectListenersTest.java
index 2a1cc0deb0..9a2a5f1f50 100644
--- a/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/select/SelectListenersTest.java
@@ -4,10 +4,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Select;
 
-public class SelectListeners extends AbstractListenerMethodsTest {
+public class SelectListenersTest extends AbstractListenerMethodsTestBase {
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Select.class, FocusEvent.class,
                 FocusListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCauses.java b/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
index beb5da0885..03f50c6b5f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCauses.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.CacheUpdateException;
 
-public class CacheUpdateExceptionCauses {
+public class CacheUpdateExceptionCausesTest {
     @Test
     public void testSingleCauseException() {
         Table table = new Table();
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java b/server/tests/src/com/vaadin/tests/server/component/table/FooterTest.java
index 647d13855b..f9d373e864 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/FooterTest.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Table;
  * Test case for testing the footer API
  * 
  */
-public class TestFooter extends TestCase {
+public class FooterTest extends TestCase {
 
     /**
      * Tests if setting the footer visibility works properly
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java b/server/tests/src/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
index ff80cdb3c3..ceb4c865d2 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
@@ -10,7 +10,7 @@ import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.ui.Table;
 
-public class TestMultipleSelection extends TestCase {
+public class MultipleSelectionTest extends TestCase {
 
     /**
      * Tests weather the multiple select mode is set when using Table.set
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java b/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
index 299f9c79d4..5e33ff2f4a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
@@ -7,12 +7,12 @@ import org.junit.Test;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.Align;
 
-public class TableColumnAlignments {
+public class TableColumnAlignmentsTest {
 
     @Test
     public void defaultColumnAlignments() {
         for (int properties = 0; properties < 10; properties++) {
-            Table t = TableGenerator.createTableWithDefaultContainer(
+            Table t = TableGeneratorTest.createTableWithDefaultContainer(
                     properties, 10);
             Object[] expected = new Object[properties];
             for (int i = 0; i < properties; i++) {
@@ -26,7 +26,7 @@ public class TableColumnAlignments {
     @Test
     public void explicitColumnAlignments() {
         int properties = 5;
-        Table t = TableGenerator
+        Table t = TableGeneratorTest
                 .createTableWithDefaultContainer(properties, 10);
         Align[] explicitAlignments = new Align[] { Align.CENTER, Align.LEFT,
                 Align.RIGHT, Align.RIGHT, Align.LEFT };
@@ -39,7 +39,7 @@ public class TableColumnAlignments {
 
     @Test
     public void invalidColumnAlignmentStrings() {
-        Table t = TableGenerator.createTableWithDefaultContainer(3, 7);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(3, 7);
         Align[] defaultAlignments = new Align[] { Align.LEFT, Align.LEFT,
                 Align.LEFT };
         try {
@@ -57,7 +57,7 @@ public class TableColumnAlignments {
 
     @Test
     public void columnAlignmentForPropertyNotInContainer() {
-        Table t = TableGenerator.createTableWithDefaultContainer(3, 7);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(3, 7);
         Align[] defaultAlignments = new Align[] { Align.LEFT, Align.LEFT,
                 Align.LEFT };
         try {
@@ -81,7 +81,7 @@ public class TableColumnAlignments {
 
     @Test
     public void invalidColumnAlignmentsLength() {
-        Table t = TableGenerator.createTableWithDefaultContainer(7, 7);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(7, 7);
         Align[] defaultAlignments = new Align[] { Align.LEFT, Align.LEFT,
                 Align.LEFT, Align.LEFT, Align.LEFT, Align.LEFT, Align.LEFT };
 
@@ -122,7 +122,7 @@ public class TableColumnAlignments {
     @Test
     public void explicitColumnAlignmentOneByOne() {
         int properties = 5;
-        Table t = TableGenerator
+        Table t = TableGeneratorTest
                 .createTableWithDefaultContainer(properties, 10);
         Align[] explicitAlignments = new Align[] { Align.CENTER, Align.LEFT,
                 Align.RIGHT, Align.RIGHT, Align.LEFT };
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java b/server/tests/src/com/vaadin/tests/server/component/table/TableGeneratorTest.java
index 0e63049944..f3c2589f4a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableGeneratorTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import com.vaadin.data.Item;
 import com.vaadin.ui.Table;
 
-public class TableGenerator {
+public class TableGeneratorTest {
     public static Table createTableWithDefaultContainer(int properties,
             int items) {
         Table t = new Table();
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java b/server/tests/src/com/vaadin/tests/server/component/table/TableListenersTest.java
index fbe5bb3146..fce514954a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableListenersTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.server.component.table;
 
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnReorderEvent;
 import com.vaadin.ui.Table.ColumnReorderListener;
@@ -13,7 +13,7 @@ import com.vaadin.ui.Table.FooterClickListener;
 import com.vaadin.ui.Table.HeaderClickEvent;
 import com.vaadin.ui.Table.HeaderClickListener;
 
-public class TableListeners extends AbstractListenerMethodsTest {
+public class TableListenersTest extends AbstractListenerMethodsTestBase {
     public void testColumnResizeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Table.class, ColumnResizeEvent.class,
                 ColumnResizeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverter.java b/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
index 418ca333bc..7fd5bc67f6 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
@@ -39,7 +39,7 @@ import com.vaadin.ui.Table;
  * @since
  * @author Vaadin Ltd
  */
-public class TablePropertyValueConverter extends TestCase {
+public class TablePropertyValueConverterTest extends TestCase {
     protected TestableTable table;
     protected Collection<?> initialProperties;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java b/server/tests/src/com/vaadin/tests/server/component/table/TableSerializationTest.java
index ee6349093c..3f3c52d6c0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableSerializationTest.java
@@ -6,7 +6,7 @@ import org.apache.commons.lang.SerializationUtils;
 
 import com.vaadin.ui.Table;
 
-public class TableSerialization extends TestCase {
+public class TableSerializationTest extends TestCase {
 
     public void testSerialization() {
         Table t = new Table();
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
index ee3eefba05..e4f229590f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import com.vaadin.ui.Table;
 
-public class TableVisibleColumns {
+public class TableVisibleColumnsTest {
 
     String[] defaultColumns3 = new String[] { "Property 0", "Property 1",
             "Property 2" };
@@ -14,7 +14,7 @@ public class TableVisibleColumns {
     @Test
     public void defaultVisibleColumns() {
         for (int properties = 0; properties < 10; properties++) {
-            Table t = TableGenerator.createTableWithDefaultContainer(
+            Table t = TableGeneratorTest.createTableWithDefaultContainer(
                     properties, 10);
             Object[] expected = new Object[properties];
             for (int i = 0; i < properties; i++) {
@@ -27,7 +27,7 @@ public class TableVisibleColumns {
 
     @Test
     public void explicitVisibleColumns() {
-        Table t = TableGenerator.createTableWithDefaultContainer(5, 10);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(5, 10);
         Object[] newVisibleColumns = new Object[] { "Property 1", "Property 2" };
         t.setVisibleColumns(newVisibleColumns);
         assertArrayEquals("Explicit visible columns, 5 properties",
@@ -37,7 +37,7 @@ public class TableVisibleColumns {
 
     @Test
     public void invalidVisibleColumnIds() {
-        Table t = TableGenerator.createTableWithDefaultContainer(3, 10);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(3, 10);
 
         try {
             t.setVisibleColumns(new Object[] { "a", "Property 2", "Property 3" });
@@ -50,7 +50,7 @@ public class TableVisibleColumns {
 
     @Test
     public void duplicateVisibleColumnIds() {
-        Table t = TableGenerator.createTableWithDefaultContainer(3, 10);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(3, 10);
         try {
             t.setVisibleColumns(new Object[] { "Property 0", "Property 1",
                     "Property 2", "Property 1" });
@@ -62,7 +62,7 @@ public class TableVisibleColumns {
 
     @Test
     public void noVisibleColumns() {
-        Table t = TableGenerator.createTableWithDefaultContainer(3, 10);
+        Table t = TableGeneratorTest.createTableWithDefaultContainer(3, 10);
         t.setVisibleColumns(new Object[] {});
         assertArrayEquals(new Object[] {}, t.getVisibleColumns());
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/ReadDesignTest.java
index f7c4f16cdc..67533c8b11 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/ReadDesignTest.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private TabSheet sheet;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java
index 5c01a1c99f..b1acf05d63 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.tabsheet;
 
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 
-public class TabSheetListeners extends AbstractListenerMethodsTest {
+public class TabSheetListenersTest extends AbstractListenerMethodsTestBase {
     public void testSelectedTabChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(TabSheet.class, SelectedTabChangeEvent.class,
                 SelectedTabChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java
index 0ef8ae5a76..29f12fa4b6 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.Tab;
 
-public class TestTabSheet {
+public class TabSheetTest {
 
     @Test
     public void addExistingComponent() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/WriteDesignTest.java
index a46b33e2d6..ab7ef9977c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/WriteDesignTest.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private TabSheet sheet;
     private Element design;
diff --git a/server/tests/src/com/vaadin/tests/server/component/textarea/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/textarea/ReadDesignTest.java
index a31367008a..aad831e91c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textarea/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textarea/ReadDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
     private DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/textarea/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/textarea/WriteDesignTest.java
index 01b0095fe9..63712eba15 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textarea/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textarea/WriteDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
     private DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/textfield/ReadDesignTest.java
index 62cb1a53bc..d3da7fef8b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TestReadDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/ReadDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
     private DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidator.java b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
index cdb001e266..83c45f94db 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidator.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
@@ -4,10 +4,10 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.validator.RangeValidator;
-import com.vaadin.tests.data.converter.ConverterFactory.ConvertTo42;
+import com.vaadin.tests.data.converter.ConverterFactoryTest.ConvertTo42;
 import com.vaadin.ui.TextField;
 
-public class TextFieldWithConverterAndValidator extends TestCase {
+public class TextFieldWithConverterAndValidatorTest extends TestCase {
 
     private TextField field;
     private ObjectProperty<Integer> property;
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
index 59922d819f..8f2bec455b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
@@ -11,7 +11,7 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertyFormatter;
 import com.vaadin.ui.TextField;
 
-public class TextFieldWithPropertyFormatter extends TestCase {
+public class TextFieldWithPropertyFormatterTest extends TestCase {
 
     private static final String INPUT_VALUE = "foo";
     private static final String PARSED_VALUE = "BAR";
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidator.java b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
index 2a79d1fe27..b2a51aad8b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidator.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
@@ -10,7 +10,7 @@ import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.data.validator.StringLengthValidator;
 import com.vaadin.ui.TextField;
 
-public class TextFieldWithValidator extends TestCase {
+public class TextFieldWithValidatorTest extends TestCase {
 
     private TextField field;
     private ObjectProperty<String> property;
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TestWriteDesign.java b/server/tests/src/com/vaadin/tests/server/component/textfield/WriteDesignTest.java
index 479c94f6a8..061b0ff402 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TestWriteDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/WriteDesignTest.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
     private DesignContext ctx;
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/ListenersTest.java
index 4984cf161b..c327fe8c5f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/ListenersTest.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 
-public class TestListeners extends TestCase implements ExpandListener,
+public class ListenersTest extends TestCase implements ExpandListener,
         CollapseListener {
     private int expandCalled;
     private int collapseCalled;
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListenersTest.java
index 8d5b499264..449f418596 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListenersTest.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.server.component.tree;
 
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 
-public class TreeListeners extends AbstractListenerMethodsTest {
+public class TreeListenersTest extends AbstractListenerMethodsTestBase {
     public void testExpandListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Tree.class, ExpandEvent.class,
                 ExpandListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java b/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
index 535ed8e860..a886b74f57 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.ui.TreeTable;
 
-public class EmptyTreeTable extends TestCase {
+public class EmptyTreeTableTest extends TestCase {
     public void testLastId() {
         TreeTable treeTable = new TreeTable();
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNull.java b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
index a3b79a14f0..4a34094da1 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNull.java
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.ui.TreeTable;
 
-public class TreeTableSetContainerNull extends TestCase {
+public class TreeTableSetContainerNullTest extends TestCase {
 
     public void testNullContainer() {
         TreeTable treeTable = new TreeTable();
diff --git a/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
index 1df1d36cab..be23a998a3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
@@ -18,7 +18,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.UI;
 
-public class CustomUIClassLoader extends TestCase {
+public class CustomUIClassLoaderTest extends TestCase {
 
     /**
      * Stub root
@@ -68,7 +68,7 @@ public class CustomUIClassLoader extends TestCase {
     private static DeploymentConfiguration createConfigurationMock() {
         Properties properties = new Properties();
         properties.put(VaadinSession.UI_PARAMETER, MyUI.class.getName());
-        return new DefaultDeploymentConfiguration(CustomUIClassLoader.class,
+        return new DefaultDeploymentConfiguration(CustomUIClassLoaderTest.class,
                 properties);
     }
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java b/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
index 24fd3d85a8..2a88bb3208 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java
+++ b/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 
-public class LegacyUIAddRemoveComponents {
+public class LegacyUIAddRemoveComponentsTest {
 
     private static class TestUI extends LegacyWindow {
         @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java b/server/tests/src/com/vaadin/tests/server/component/upload/UploadListenersTest.java
index 265e5382d4..13d4c6bfe6 100644
--- a/server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/upload/UploadListenersTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.server.component.upload;
 
 import com.vaadin.server.StreamVariable.StreamingProgressEvent;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.FailedEvent;
 import com.vaadin.ui.Upload.FailedListener;
@@ -13,7 +13,7 @@ import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.Upload.SucceededEvent;
 import com.vaadin.ui.Upload.SucceededListener;
 
-public class UploadListeners extends AbstractListenerMethodsTest {
+public class UploadListenersTest extends AbstractListenerMethodsTestBase {
     public void testProgressListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Upload.class, StreamingProgressEvent.class,
                 ProgressListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
index 774eafceaf..7fa8665c01 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Window;
 
-public class AddRemoveSubWindow {
+public class AddRemoveSubWindowTest {
 
     public class TestApp extends LegacyApplication {
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java
index 5720744e2f..9f7a54df9c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java
@@ -19,7 +19,7 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
-public class AttachDetachWindow {
+public class AttachDetachWindowTest {
 
     private VaadinSession testApp = new AlwaysLockedVaadinSession(null);
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowAttach.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowAttachTest.java
index 586300f650..867342ab03 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowAttach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowAttachTest.java
@@ -22,7 +22,7 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
-public class WindowAttach {
+public class WindowAttachTest {
 
     private static class MyUI extends UI {
         @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowListenersTest.java
index c33871cbd8..87a1af301c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowListenersTest.java
@@ -4,14 +4,14 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.Window.CloseListener;
 import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
 
-public class WindowListeners extends AbstractListenerMethodsTest {
+public class WindowListenersTest extends AbstractListenerMethodsTestBase {
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Window.class, FocusEvent.class,
                 FocusListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
index e3e743d02a..f19821f92e 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 
-public abstract class AbstractIndexedLayoutTest extends TestCase {
+public abstract class AbstractIndexedLayoutTestBase extends TestCase {
 
     private Layout layout;
 
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
index dc9667c38e..8dd36beda3 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
@@ -4,7 +4,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Layout;
 
-public class CssLayoutTest extends AbstractIndexedLayoutTest {
+public class CssLayoutTest extends AbstractIndexedLayoutTestBase {
 
     @Override
     protected Layout createLayout() {
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
index 50de871106..c689e7fe06 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 
-public class FormLayoutTest extends AbstractIndexedLayoutTest {
+public class FormLayoutTest extends AbstractIndexedLayoutTestBase {
 
     @Override
     protected Layout createLayout() {
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
index 0e3a1d5734..565cc8e8ab 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
@@ -4,7 +4,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.VerticalLayout;
 
-public class VerticalLayoutTest extends AbstractIndexedLayoutTest {
+public class VerticalLayoutTest extends AbstractIndexedLayoutTestBase {
 
     @Override
     protected Layout createLayout() {
diff --git a/server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
index c8d6ecce9c..637947fc9b 100644
--- a/server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
@@ -22,7 +22,7 @@ import com.vaadin.ui.AbstractField;
  * override {@link #setValue(AbstractField)} to set the field value via
  * <code>changeVariables()</code>.
  */
-public abstract class AbstractTestFieldValueChange<T> extends TestCase {
+public abstract class AbstractFieldValueChangeTestBase<T> extends TestCase {
 
     private AbstractField<T> field;
     private ValueChangeListener listener;
diff --git a/server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java b/server/tests/src/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
index 308889fa33..f3cc337657 100644
--- a/server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
@@ -12,8 +12,8 @@ import com.vaadin.ui.ComboBox;
  * 
  * See <a href="http://dev.vaadin.com/ticket/4394">Ticket 4394</a>.
  */
-public class TestComboBoxValueChange extends
-        AbstractTestFieldValueChange<Object> {
+public class ComboBoxValueChangeTest extends
+        AbstractFieldValueChangeTestBase<Object> {
     @Override
     protected void setUp() throws Exception {
         ComboBox combo = new ComboBox();
diff --git a/server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java b/server/tests/src/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
index 92664917fd..3467d1d80c 100644
--- a/server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
+++ b/server/tests/src/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 
-public class TestGridLayoutLastRowRemoval extends TestCase {
+public class GridLayoutLastRowRemovalTest extends TestCase {
 
     public void testRemovingLastRow() {
         GridLayout grid = new GridLayout(2, 1);
diff --git a/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
index 7c47b94df4..cfceb6f7d7 100644
--- a/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
@@ -17,8 +17,8 @@ import com.vaadin.ui.TextField;
  * 
  * See <a href="http://dev.vaadin.com/ticket/4394">Ticket 4394</a>.
  */
-public class TestTextFieldValueChange extends
-        AbstractTestFieldValueChange<String> {
+public class TextFieldValueChangeTest extends
+        AbstractFieldValueChangeTestBase<String> {
 
     @Override
     protected void setUp() throws Exception {
diff --git a/server/tests/src/com/vaadin/tests/server/components/TestWindow.java b/server/tests/src/com/vaadin/tests/server/components/WindowTest.java
index 6707965be6..26fe238342 100644
--- a/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/components/WindowTest.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.Window.CloseListener;
 import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
 
-public class TestWindow extends TestCase {
+public class WindowTest extends TestCase {
 
     private Window window;
 
diff --git a/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java b/server/tests/src/com/vaadin/tests/server/validation/BeanValidationTest.java
index 832ae14950..6b7582525e 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/BeanValidationTest.java
@@ -9,7 +9,7 @@ import com.vaadin.data.validator.BeanValidator;
 import com.vaadin.tests.data.bean.BeanToValidate;
 import com.vaadin.ui.Field;
 
-public class TestBeanValidation {
+public class BeanValidationTest {
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationNull() {
         BeanValidator validator = new BeanValidator(BeanToValidate.class,
diff --git a/server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java b/server/tests/src/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
index e37b97e02c..661236e597 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import com.vaadin.data.validator.IntegerValidator;
 import com.vaadin.ui.TextField;
 
-public class TestReadOnlyValidation {
+public class ReadOnlyValidationTest {
 
     @Test
     public void testIntegerValidation() {
diff --git a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java
index fa69fc46da..bb5babf360 100644
--- a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java
+++ b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java
@@ -12,7 +12,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 
-public class AbsFieldDataSourceLocaleChange {
+public class AbsFieldDataSourceLocaleChangeTest {
 
     private VaadinSession vaadinSession;
     private UI ui;
diff --git a/server/tests/src/com/vaadin/ui/AbstractSelectTest.java b/server/tests/src/com/vaadin/ui/AbsSelectTest.java
index bd399f088c..0b807c5f21 100644
--- a/server/tests/src/com/vaadin/ui/AbstractSelectTest.java
+++ b/server/tests/src/com/vaadin/ui/AbsSelectTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import com.vaadin.data.util.ObjectProperty;
 
-public class AbstractSelectTest {
+public class AbsSelectTest {
 
     @Test
     public void addItemsStrings() {
diff --git a/server/tests/src/com/vaadin/ui/LabelDataSource.java b/server/tests/src/com/vaadin/ui/LabelDataSourceTest.java
index b57e83df8e..8ec3ca1245 100644
--- a/server/tests/src/com/vaadin/ui/LabelDataSource.java
+++ b/server/tests/src/com/vaadin/ui/LabelDataSourceTest.java
@@ -26,7 +26,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 
-public class LabelDataSource {
+public class LabelDataSourceTest {
 
     Label label;
     private static final String STRING_DS_VALUE = "String DatA source";
diff --git a/server/tests/src/com/vaadin/ui/UIThemeEscaping.java b/server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java
index 236f283823..7a0a5551e3 100644
--- a/server/tests/src/com/vaadin/ui/UIThemeEscaping.java
+++ b/server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class UIThemeEscaping {
+public class UIThemeEscapingTest {
 
     private UI ui;
 
diff --git a/server/tests/src/com/vaadin/util/TestCurrentInstance.java b/server/tests/src/com/vaadin/util/CurrentInstanceTest.java
index 666a0ef019..36055a036a 100644
--- a/server/tests/src/com/vaadin/util/TestCurrentInstance.java
+++ b/server/tests/src/com/vaadin/util/CurrentInstanceTest.java
@@ -30,7 +30,7 @@ import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.UI;
 
-public class TestCurrentInstance {
+public class CurrentInstanceTest {
 
     @Test
     public void testInitiallyCleared() throws Exception {
@@ -39,20 +39,20 @@ public class TestCurrentInstance {
 
     @Test
     public void testClearedAfterRemove() throws Exception {
-        CurrentInstance.set(TestCurrentInstance.class, this);
+        CurrentInstance.set(CurrentInstanceTest.class, this);
         Assert.assertEquals(this,
-                CurrentInstance.get(TestCurrentInstance.class));
-        CurrentInstance.set(TestCurrentInstance.class, null);
+                CurrentInstance.get(CurrentInstanceTest.class));
+        CurrentInstance.set(CurrentInstanceTest.class, null);
 
         assertCleared();
     }
 
     @Test
     public void testClearedAfterRemoveInheritable() throws Exception {
-        CurrentInstance.setInheritable(TestCurrentInstance.class, this);
+        CurrentInstance.setInheritable(CurrentInstanceTest.class, this);
         Assert.assertEquals(this,
-                CurrentInstance.get(TestCurrentInstance.class));
-        CurrentInstance.setInheritable(TestCurrentInstance.class, null);
+                CurrentInstance.get(CurrentInstanceTest.class));
+        CurrentInstance.setInheritable(CurrentInstanceTest.class, null);
 
         assertCleared();
     }
@@ -61,19 +61,19 @@ public class TestCurrentInstance {
     public void testInheritableThreadLocal() throws Exception {
         final AtomicBoolean threadFailed = new AtomicBoolean(true);
 
-        CurrentInstance.setInheritable(TestCurrentInstance.class, this);
+        CurrentInstance.setInheritable(CurrentInstanceTest.class, this);
         Assert.assertEquals(this,
-                CurrentInstance.get(TestCurrentInstance.class));
+                CurrentInstance.get(CurrentInstanceTest.class));
         Thread t = new Thread() {
             @Override
             public void run() {
-                Assert.assertEquals(TestCurrentInstance.this,
-                        CurrentInstance.get(TestCurrentInstance.class));
+                Assert.assertEquals(CurrentInstanceTest.this,
+                        CurrentInstance.get(CurrentInstanceTest.class));
                 threadFailed.set(false);
             }
         };
         t.start();
-        CurrentInstance.set(TestCurrentInstance.class, null);
+        CurrentInstance.set(CurrentInstanceTest.class, null);
 
         assertCleared();
         while (t.isAlive()) {
@@ -87,16 +87,16 @@ public class TestCurrentInstance {
     public void testClearedAfterRemoveInSeparateThread() throws Exception {
         final AtomicBoolean threadFailed = new AtomicBoolean(true);
 
-        CurrentInstance.setInheritable(TestCurrentInstance.class, this);
+        CurrentInstance.setInheritable(CurrentInstanceTest.class, this);
         Assert.assertEquals(this,
-                CurrentInstance.get(TestCurrentInstance.class));
+                CurrentInstance.get(CurrentInstanceTest.class));
         Thread t = new Thread() {
             @Override
             public void run() {
                 try {
-                    Assert.assertEquals(TestCurrentInstance.this,
-                            CurrentInstance.get(TestCurrentInstance.class));
-                    CurrentInstance.set(TestCurrentInstance.class, null);
+                    Assert.assertEquals(CurrentInstanceTest.this,
+                            CurrentInstance.get(CurrentInstanceTest.class));
+                    CurrentInstance.set(CurrentInstanceTest.class, null);
                     assertCleared();
 
                     threadFailed.set(false);
@@ -115,18 +115,18 @@ public class TestCurrentInstance {
         // Clearing the threadlocal in the thread should not have cleared it
         // here
         Assert.assertEquals(this,
-                CurrentInstance.get(TestCurrentInstance.class));
+                CurrentInstance.get(CurrentInstanceTest.class));
 
         // Clearing the only remaining threadlocal should free all memory
-        CurrentInstance.set(TestCurrentInstance.class, null);
+        CurrentInstance.set(CurrentInstanceTest.class, null);
         assertCleared();
     }
 
     @Test
     public void testClearedWithClearAll() throws Exception {
-        CurrentInstance.set(TestCurrentInstance.class, this);
+        CurrentInstance.set(CurrentInstanceTest.class, this);
         Assert.assertEquals(this,
-                CurrentInstance.get(TestCurrentInstance.class));
+                CurrentInstance.get(CurrentInstanceTest.class));
         CurrentInstance.clearAll();
 
         assertCleared();
diff --git a/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByType.java b/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
index 25f8ba7796..67796314c0 100644
--- a/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByType.java
+++ b/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
-public class ReflectToolsGetFieldValueByType {
+public class ReflectToolsGetFieldValueByTypeTest {
     @Test
     public void getFieldValue() {
         class MyClass {
diff --git a/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValue.java b/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
index 690f77d9a5..40e8f05e1e 100644
--- a/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValue.java
+++ b/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
-public class ReflectToolsGetPrimitiveFieldValue {
+public class ReflectToolsGetPrimitiveFieldValueTest {
     @Test
     public void getFieldValueViaGetter() {
         class MyClass {