Merge remote-tracking branch 'origin/master' into grid

Change-Id: Ic6b667ea6ceff43a609ce2037f656c6274871fb7

238 files changed, 834 insertions, 719 deletions

diff --git a/server/ivy.xml b/server/ivy.xml
index 2901be8090..b30e6a72ef 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -70,6 +70,8 @@
             conf="test,ide -> default" />
         <dependency org="org.mockito" name="mockito-all" rev="1.9.5"
             conf="test,ide->default" />
+        <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3"
+                    conf="test,ide->default" />
         <dependency org="org.easymock" name="easymock" rev="3.0"
             conf="test,ide-> default" transitive="true" />
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index bfe195ccf9..c45e2b70e0 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -414,6 +414,9 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
         String vaadinLocation = vaadinService.getStaticFileLocation(request)
                 + "/VAADIN/";
 
+        // Parameter appended to JS to bypass caches after version upgrade.
+        String versionQueryParam = "?v=" + Version.getFullVersion();
+
         if (context.getPushMode().isEnabled()) {
             // Load client-side dependencies for push support
             String pushJS = vaadinLocation;
@@ -424,12 +427,14 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
                 pushJS += ApplicationConstants.VAADIN_PUSH_DEBUG_JS;
             }
 
+            pushJS += versionQueryParam;
+
             fragmentNodes.add(new Element(Tag.valueOf("script"), "").attr(
                     "type", "text/javascript").attr("src", pushJS));
         }
 
         String bootstrapLocation = vaadinLocation
-                + ApplicationConstants.VAADIN_BOOTSTRAP_JS;
+                + ApplicationConstants.VAADIN_BOOTSTRAP_JS + versionQueryParam;
         fragmentNodes.add(new Element(Tag.valueOf("script"), "").attr("type",
                 "text/javascript").attr("src", bootstrapLocation));
         Element mainScriptTag = new Element(Tag.valueOf("script"), "").attr(
@@ -513,7 +518,6 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
         }
 
         appConfig.put("versionInfo", versionInfo);
-
         appConfig.put("widgetset", context.getWidgetsetName());
 
         // Use locale from session if set, else from the request
@@ -525,42 +529,32 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
         if (systemMessages != null) {
             // Write the CommunicationError -message to client
             JsonObject comErrMsg = Json.createObject();
-            comErrMsg.put("caption",
+            putValueOrNull(comErrMsg, "caption",
                     systemMessages.getCommunicationErrorCaption());
-            comErrMsg.put("message",
+            putValueOrNull(comErrMsg, "message",
                     systemMessages.getCommunicationErrorMessage());
-            if (systemMessages.getCommunicationErrorURL() == null) {
-                comErrMsg.put("url", Json.createNull());
-            } else {
-                comErrMsg.put("url", systemMessages.getCommunicationErrorURL());
-            }
+            putValueOrNull(comErrMsg, "url",
+                    systemMessages.getCommunicationErrorURL());
 
             appConfig.put("comErrMsg", comErrMsg);
 
             JsonObject authErrMsg = Json.createObject();
-            authErrMsg.put("caption",
+            putValueOrNull(authErrMsg, "caption",
                     systemMessages.getAuthenticationErrorCaption());
-            authErrMsg.put("message",
+            putValueOrNull(authErrMsg, "message",
                     systemMessages.getAuthenticationErrorMessage());
-            if (systemMessages.getAuthenticationErrorURL() == null) {
-                authErrMsg.put("url", Json.createNull());
-            } else {
-                authErrMsg.put("url",
-                        systemMessages.getAuthenticationErrorURL());
-            }
+            putValueOrNull(authErrMsg, "url",
+                    systemMessages.getAuthenticationErrorURL());
 
             appConfig.put("authErrMsg", authErrMsg);
 
             JsonObject sessExpMsg = Json.createObject();
-            sessExpMsg
-                    .put("caption", systemMessages.getSessionExpiredCaption());
-            sessExpMsg
-                    .put("message", systemMessages.getSessionExpiredMessage());
-            if (systemMessages.getSessionExpiredURL() == null) {
-                sessExpMsg.put("url", Json.createNull());
-            } else {
-                sessExpMsg.put("url", systemMessages.getSessionExpiredURL());
-            }
+            putValueOrNull(sessExpMsg, "caption",
+                    systemMessages.getSessionExpiredCaption());
+            putValueOrNull(sessExpMsg, "message",
+                    systemMessages.getSessionExpiredMessage());
+            putValueOrNull(sessExpMsg, "url",
+                    systemMessages.getSessionExpiredURL());
 
             appConfig.put("sessExpMsg", sessExpMsg);
         }
@@ -624,7 +618,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
     }
 
     /**
-     * Don not override.
+     * Do not override.
      * 
      * @param context
      * @return
@@ -648,4 +642,14 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
         response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
                 e.getLocalizedMessage());
     }
+
+    private void putValueOrNull(JsonObject object, String key, String value) {
+        assert object != null;
+        assert key != null;
+        if (value == null) {
+            object.put(key, Json.createNull());
+        } else {
+            object.put(key, value);
+        }
+    }
 }
diff --git a/server/src/com/vaadin/server/LegacyCommunicationManager.java b/server/src/com/vaadin/server/LegacyCommunicationManager.java
index 485084b515..fda5ad444f 100644
--- a/server/src/com/vaadin/server/LegacyCommunicationManager.java
+++ b/server/src/com/vaadin/server/LegacyCommunicationManager.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -81,6 +82,8 @@ public class LegacyCommunicationManager implements Serializable {
         return session;
     }
 
+    private static final ConcurrentHashMap<Class<? extends SharedState>, JsonValue> referenceDiffStates = new ConcurrentHashMap<Class<? extends SharedState>, JsonValue>();
+
     /**
      * @deprecated As of 7.1. See #11411.
      */
@@ -96,17 +99,10 @@ public class LegacyCommunicationManager implements Serializable {
         if (diffState == null && supportsDiffState) {
             // Use an empty state object as reference for full
             // repaints
-
-            try {
-                SharedState referenceState = stateType.newInstance();
-                EncodeResult encodeResult = JsonCodec.encode(referenceState,
-                        null, stateType, uI.getConnectorTracker());
-                diffState = encodeResult.getEncodedValue();
-            } catch (Exception e) {
-                getLogger()
-                        .log(Level.WARNING,
-                                "Error creating reference object for state of type {0}",
-                                stateType.getName());
+            diffState = referenceDiffStates.get(stateType);
+            if (diffState == null) {
+                diffState = createReferenceDiffStateState(stateType);
+                referenceDiffStates.put(stateType, diffState);
             }
         }
         EncodeResult encodeResult = JsonCodec.encode(state, diffState,
@@ -118,6 +114,21 @@ public class LegacyCommunicationManager implements Serializable {
         return (JsonObject) encodeResult.getDiff();
     }
 
+    private static JsonValue createReferenceDiffStateState(
+            Class<? extends SharedState> stateType) {
+        try {
+            SharedState referenceState = stateType.newInstance();
+            EncodeResult encodeResult = JsonCodec.encode(referenceState, null,
+                    stateType, null);
+            return encodeResult.getEncodedValue();
+        } catch (Exception e) {
+            getLogger().log(Level.WARNING,
+                    "Error creating reference object for state of type {0}",
+                    stateType.getName());
+            return null;
+        }
+    }
+
     /**
      * Resolves a dependency URI, registering the URI with this
      * {@code LegacyCommunicationManager} if needed and returns a fully
diff --git a/server/src/com/vaadin/server/VaadinPortletResponse.java b/server/src/com/vaadin/server/VaadinPortletResponse.java
index d9f133ac8a..2b6e0c75fb 100644
--- a/server/src/com/vaadin/server/VaadinPortletResponse.java
+++ b/server/src/com/vaadin/server/VaadinPortletResponse.java
@@ -97,6 +97,14 @@ public class VaadinPortletResponse implements VaadinResponse {
     }
 
     @Override
+    public void setContentLength(int len) {
+        if (response instanceof ResourceResponse) {
+            ((ResourceResponse) response).setContentLength(len);
+        }
+
+    }
+
+    @Override
     public PrintWriter getWriter() throws IOException {
         if (response instanceof MimeResponse) {
             return ((MimeResponse) response).getWriter();
diff --git a/server/src/com/vaadin/server/VaadinResponse.java b/server/src/com/vaadin/server/VaadinResponse.java
index 1d5fcf141f..c31c6c05d8 100644
--- a/server/src/com/vaadin/server/VaadinResponse.java
+++ b/server/src/com/vaadin/server/VaadinResponse.java
@@ -169,4 +169,17 @@ public interface VaadinResponse extends Serializable {
      * @see PortletResponse#addProperty(Cookie)
      */
     public void addCookie(Cookie cookie);
+
+    /**
+     * Sets the length of the content body in the response In HTTP servlets,
+     * this method sets the HTTP Content-Length header. For some portlet
+     * responses, this method sets the content-length header, for others this
+     * method does nothing.
+     *
+     * @param len
+     *            an integer specifying the length of the content being returned
+     *            to the client
+     * @since 7.3.8
+     */
+    public void setContentLength(int len);
 }
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index d1242676da..aa76dc8e08 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -45,14 +46,21 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.io.Files;
 import com.vaadin.annotations.VaadinServletConfiguration;
 import com.vaadin.annotations.VaadinServletConfiguration.InitParameterName;
 import com.vaadin.sass.internal.ScssStylesheet;
 import com.vaadin.server.communication.ServletUIInitHandler;
 import com.vaadin.shared.JsonConstants;
+import com.vaadin.shared.Version;
 import com.vaadin.ui.UI;
 import com.vaadin.util.CurrentInstance;
 
+import elemental.json.Json;
+import elemental.json.JsonArray;
+import elemental.json.JsonObject;
+
 @SuppressWarnings("serial")
 public class VaadinServlet extends HttpServlet implements Constants {
 
@@ -61,14 +69,47 @@ public class VaadinServlet extends HttpServlet implements Constants {
         private final String css;
         private final List<String> sourceUris;
         private final long timestamp;
+        private final String scssFileName;
 
-        public ScssCacheEntry(String css, List<String> sourceUris) {
+        public ScssCacheEntry(String scssFileName, String css,
+                List<String> sourceUris) {
+            this.scssFileName = scssFileName;
             this.css = css;
             this.sourceUris = sourceUris;
 
             timestamp = getLastModified();
         }
 
+        public ScssCacheEntry(JsonObject json) {
+            css = json.getString("css");
+            timestamp = Long.parseLong(json.getString("timestamp"));
+
+            sourceUris = new ArrayList<String>();
+
+            JsonArray uris = json.getArray("uris");
+            for (int i = 0; i < uris.length(); i++) {
+                sourceUris.add(uris.getString(i));
+            }
+
+            // Not set for cache entries read from disk
+            scssFileName = null;
+        }
+
+        public String asJson() {
+            JsonArray uris = Json.createArray();
+            for (String uri : sourceUris) {
+                uris.set(uris.length(), uri);
+            }
+
+            JsonObject object = Json.createObject();
+            object.put("version", Version.getFullVersion());
+            object.put("timestamp", Long.toString(timestamp));
+            object.put("uris", uris);
+            object.put("css", css);
+
+            return object.toJson();
+        }
+
         public String getCss() {
             return css;
         }
@@ -117,6 +158,10 @@ public class VaadinServlet extends HttpServlet implements Constants {
             }
         }
 
+        public String getScssFileName() {
+            return scssFileName;
+        }
+
     }
 
     private VaadinServletService servletService;
@@ -612,7 +657,14 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * Global cache of scss compilation results. This map is protected from
      * concurrent access by {@link #SCSS_MUTEX}.
      */
-    private static final Map<String, ScssCacheEntry> scssCache = new HashMap<String, ScssCacheEntry>();
+    private final Map<String, ScssCacheEntry> scssCache = new HashMap<String, ScssCacheEntry>();
+
+    /**
+     * Keeps track of whether a warning about not being able to persist cache
+     * files has already been printed. The flag is protected from concurrent
+     * access by {@link #SCSS_MUTEX}.
+     */
+    private static boolean scssCompileWarWarningEmitted = false;
 
     /**
      * Returns the default theme. Must never return null.
@@ -900,10 +952,20 @@ public class VaadinServlet extends HttpServlet implements Constants {
         synchronized (SCSS_MUTEX) {
             ScssCacheEntry cacheEntry = scssCache.get(scssFilename);
 
+            if (cacheEntry == null) {
+                try {
+                    cacheEntry = loadPersistedScssCache(scssFilename, sc);
+                } catch (Exception e) {
+                    getLogger().log(Level.WARNING,
+                            "Could not read persisted scss cache", e);
+                }
+            }
+
             if (cacheEntry == null || !cacheEntry.isStillValid()) {
                 cacheEntry = compileScssOnTheFly(filename, scssFilename, sc);
-                scssCache.put(scssFilename, cacheEntry);
+                persistCacheEntry(cacheEntry);
             }
+            scssCache.put(scssFilename, cacheEntry);
 
             if (cacheEntry == null) {
                 // compilation did not produce any result, but logged a message
@@ -920,6 +982,29 @@ public class VaadinServlet extends HttpServlet implements Constants {
         }
     }
 
+    private ScssCacheEntry loadPersistedScssCache(String scssFilename,
+            ServletContext sc) throws IOException {
+        String realFilename = sc.getRealPath(scssFilename);
+
+        File scssCacheFile = getScssCacheFile(new File(realFilename));
+        if (!scssCacheFile.exists()) {
+            return null;
+        }
+
+        String jsonString = Files.toString(scssCacheFile, Charsets.UTF_8);
+
+        JsonObject entryJson = Json.parse(jsonString);
+
+        String cacheVersion = entryJson.getString("version");
+        if (!Version.getFullVersion().equals(cacheVersion)) {
+            // Compiled for some other Vaadin version, discard cache
+            scssCacheFile.delete();
+            return null;
+        }
+
+        return new ScssCacheEntry(entryJson);
+    }
+
     private ScssCacheEntry compileScssOnTheFly(String filename,
             String scssFilename, ServletContext sc) throws IOException {
         String realFilename = sc.getRealPath(scssFilename);
@@ -951,7 +1036,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
             return null;
         }
 
-        return new ScssCacheEntry(scss.printState(), scss.getSourceUris());
+        return new ScssCacheEntry(realFilename, scss.printState(),
+                scss.getSourceUris());
     }
 
     /**
@@ -1196,6 +1282,36 @@ public class VaadinServlet extends HttpServlet implements Constants {
         getService().destroy();
     }
 
+    private static void persistCacheEntry(ScssCacheEntry cacheEntry) {
+        String scssFileName = cacheEntry.getScssFileName();
+        if (scssFileName == null) {
+            if (!scssCompileWarWarningEmitted) {
+                getLogger()
+                        .warning(
+                                "Could not persist scss cache because no real file was found for the compiled scss file. "
+                                        + "This might happen e.g. if serving the scss file directly from a .war file.");
+                scssCompileWarWarningEmitted = true;
+            }
+            return;
+        }
+
+        File scssFile = new File(scssFileName);
+        File cacheFile = getScssCacheFile(scssFile);
+
+        String cacheEntryJsonString = cacheEntry.asJson();
+
+        try {
+            Files.write(cacheEntryJsonString, cacheFile, Charsets.UTF_8);
+        } catch (IOException e) {
+            getLogger().log(Level.WARNING,
+                    "Error persisting scss cache " + cacheFile, e);
+        }
+    }
+
+    private static File getScssCacheFile(File scssFile) {
+        return new File(scssFile.getParentFile(), scssFile.getName() + ".cache");
+    }
+
     /**
      * Escapes characters to html entities. An exception is made for some
      * "safe characters" to keep the text somewhat readable.
diff --git a/server/src/com/vaadin/server/communication/UIInitHandler.java b/server/src/com/vaadin/server/communication/UIInitHandler.java
index 018274330f..3a6dc1e55f 100644
--- a/server/src/com/vaadin/server/communication/UIInitHandler.java
+++ b/server/src/com/vaadin/server/communication/UIInitHandler.java
@@ -112,7 +112,7 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler {
         response.setHeader("Cache-Control", "no-cache");
 
         byte[] b = json.getBytes("UTF-8");
-        response.setHeader("Content-Length", String.valueOf(b.length));
+        response.setContentLength(b.length);
 
         OutputStream outputStream = response.getOutputStream();
         outputStream.write(b);
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java
index 12aa8ea9a6..6353a4b25d 100644
--- a/server/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/server/src/com/vaadin/ui/AbsoluteLayout.java
@@ -746,7 +746,7 @@ public class AbsoluteLayout extends AbstractLayout implements
     /**
      * Private method for writing position attributes
      * 
-     * @since
+     * @since 7.4
      * @param node
      *            target node
      * @param key
diff --git a/server/src/com/vaadin/ui/Calendar.java b/server/src/com/vaadin/ui/Calendar.java
index 5b5c390fa1..206cc01d1a 100644
--- a/server/src/com/vaadin/ui/Calendar.java
+++ b/server/src/com/vaadin/ui/Calendar.java
@@ -297,6 +297,11 @@ public class Calendar extends AbstractComponent implements
     }
 
     @Override
+    protected CalendarState getState(boolean markAsDirty) {
+        return (CalendarState) super.getState(markAsDirty);
+    }
+
+    @Override
     public void beforeClientResponse(boolean initial) {
         super.beforeClientResponse(initial);
 
@@ -1667,7 +1672,7 @@ public class Calendar extends AbstractComponent implements
      *         weekly mode
      */
     public boolean isMonthlyMode() {
-        CalendarState state = (CalendarState) getState(false);
+        CalendarState state = getState(false);
         if (state.days != null) {
             return state.days.size() > 7;
         } else {
@@ -1895,4 +1900,34 @@ public class Calendar extends AbstractComponent implements
             dropHandler.getAcceptCriterion().paint(target);
         }
     }
+
+    /**
+     * Sets whether the event captions are rendered as HTML.
+     * <p>
+     * If set to true, the captions are rendered in the browser as HTML and the
+     * developer is responsible for ensuring no harmful HTML is used. If set to
+     * false, the caption is rendered in the browser as plain text.
+     * <p>
+     * The default is false, i.e. to render that caption as plain text.
+     * 
+     * @param captionAsHtml
+     *            true if the captions are rendered as HTML, false if rendered
+     *            as plain text
+     */
+    public void setEventCaptionAsHtml(boolean eventCaptionAsHtml) {
+        getState().eventCaptionAsHtml = eventCaptionAsHtml;
+    }
+
+    /**
+     * Checks whether event captions are rendered as HTML
+     * <p>
+     * The default is false, i.e. to render that caption as plain text.
+     * 
+     * @return true if the captions are rendered as HTML, false if rendered as
+     *         plain text
+     */
+    public boolean isEventCaptionAsHtml() {
+        return getState(false).eventCaptionAsHtml;
+    }
+
 }
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 2cf64bbc7c..3c30b41d39 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
@@ -25,7 +25,7 @@ import com.vaadin.data.util.filter.Compare;
  * 
  * 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 91e222af77..5828ac88cc 100644
--- a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/IndexedContainerTest.java
@@ -11,7 +11,7 @@ import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 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/SQLContainerTableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 2d66b728a7..bef57fd7d1 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
@@ -70,8 +70,7 @@ public class SQLContainerTableQueryTest {
     }
 
     @Test
-    public void itemWithExistingVersionColumnIsRemoved()
-            throws SQLException {
+    public void itemWithExistingVersionColumnIsRemoved() throws SQLException {
         container.setAutoCommit(true);
         peopleQuery.setVersionColumn("ID");
 
@@ -79,7 +78,8 @@ public class SQLContainerTableQueryTest {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void itemWithNonExistingVersionColumnCannotBeRemoved() throws SQLException {
+    public void itemWithNonExistingVersionColumnCannotBeRemoved()
+            throws SQLException {
         peopleQuery.setVersionColumn("version");
 
         container.removeItem(container.lastItemId());
@@ -99,33 +99,32 @@ public class SQLContainerTableQueryTest {
         SQLContainer container = new SQLContainer(new TableQuery("people",
                 connectionPool, SQLTestsConstants.sqlGen));
 
-        assertTrue(container.containsId(new RowId(
-                new Object[]{1 + offset})));
+        assertTrue(container.containsId(new RowId(new Object[] { 1 + offset })));
         Assert.assertTrue(container.containsId(new RowId(
                 new Object[] { 1 + offset })));
         assertTrue(this.container.containsId(new RowId(
-                new Object[]{1 + offset})));
+                new Object[] { 1 + offset })));
     }
 
     @Test
     public void containsId_withTableQueryAndNonexistingId_returnsFalse()
             throws SQLException {
         Assert.assertFalse(container.containsId(new RowId(
-                new Object[]{1337 + offset})));
+                new Object[] { 1337 + offset })));
     }
 
     @Test
     public void getContainerProperty_tableExistingItemIdAndNonexistingPropertyId_returnsNull()
             throws SQLException {
         Assert.assertNull(container.getContainerProperty(new RowId(
-                new Object[]{1 + offset}), "asdf"));
+                new Object[] { 1 + offset }), "asdf"));
     }
 
     @Test
     public void getContainerProperty_tableNonexistingItemId_returnsNull()
             throws SQLException {
         Assert.assertNull(container.getContainerProperty(new RowId(
-                new Object[]{1337 + offset}), "NAME"));
+                new Object[] { 1337 + offset }), "NAME"));
     }
 
     @Test
@@ -156,24 +155,23 @@ public class SQLContainerTableQueryTest {
                     "Ville",
                     container
                             .getContainerProperty(
-                                    new RowId(new Object[]{new BigDecimal(
-                                            0 + offset)}), "NAME").getValue());
+                                    new RowId(new Object[] { new BigDecimal(
+                                            0 + offset) }), "NAME").getValue());
         } else {
             Assert.assertEquals(
                     "Ville",
                     container.getContainerProperty(
-                            new RowId(new Object[]{0 + offset}), "NAME")
+                            new RowId(new Object[] { 0 + offset }), "NAME")
                             .getValue());
         }
     }
 
-
     @Test
     public void getContainerPropertyIds_table_returnsIDAndNAME()
             throws SQLException {
         Collection<?> propertyIds = container.getContainerPropertyIds();
         Assert.assertEquals(3, propertyIds.size());
-        Assert.assertArrayEquals(new String[]{"ID", "NAME", "AGE"},
+        Assert.assertArrayEquals(new String[] { "ID", "NAME", "AGE" },
                 propertyIds.toArray());
     }
 
@@ -288,10 +286,10 @@ public class SQLContainerTableQueryTest {
             throws SQLException {
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertEquals(3, container.indexOfId(new RowId(
-                    new Object[]{new BigDecimal(3 + offset)})));
+                    new Object[] { new BigDecimal(3 + offset) })));
         } else {
             Assert.assertEquals(3,
-                    container.indexOfId(new RowId(new Object[]{3 + offset})));
+                    container.indexOfId(new RowId(new Object[] { 3 + offset })));
         }
     }
 
@@ -301,14 +299,14 @@ public class SQLContainerTableQueryTest {
         DataGenerator.addFiveThousandPeople(connectionPool);
 
         if (SQLTestsConstants.db == DB.ORACLE) {
-            container.getItem(new RowId(new Object[]{new BigDecimal(
-                    1337 + offset)}));
+            container.getItem(new RowId(new Object[] { new BigDecimal(
+                    1337 + offset) }));
             Assert.assertEquals(1337, container.indexOfId(new RowId(
-                    new Object[]{new BigDecimal(1337 + offset)})));
+                    new Object[] { new BigDecimal(1337 + offset) })));
         } else {
-            container.getItem(new RowId(new Object[]{1337 + offset}));
+            container.getItem(new RowId(new Object[] { 1337 + offset }));
             Assert.assertEquals(1337, container.indexOfId(new RowId(
-                    new Object[]{1337 + offset})));
+                    new Object[] { 1337 + offset })));
         }
     }
 
@@ -332,7 +330,7 @@ public class SQLContainerTableQueryTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
 
-         Object itemId = container.getIdByIndex(1337);
+        Object itemId = container.getIdByIndex(1337);
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertEquals(
                     new RowId(new Object[] { 1337 + offset }).toString(),
@@ -367,10 +365,10 @@ public class SQLContainerTableQueryTest {
         Object itemId = container.getIdByIndex(1337);
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertEquals(
-                    new RowId(new Object[]{1336 + offset}).toString(),
+                    new RowId(new Object[] { 1336 + offset }).toString(),
                     container.prevItemId(itemId).toString());
         } else {
-            Assert.assertEquals(new RowId(new Object[]{1336 + offset}),
+            Assert.assertEquals(new RowId(new Object[] { 1336 + offset }),
                     container.prevItemId(itemId));
         }
     }
@@ -379,10 +377,10 @@ public class SQLContainerTableQueryTest {
     public void firstItemId_table_returnsItemId0() throws SQLException {
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertEquals(
-                    new RowId(new Object[]{0 + offset}).toString(),
+                    new RowId(new Object[] { 0 + offset }).toString(),
                     container.firstItemId().toString());
         } else {
-            Assert.assertEquals(new RowId(new Object[]{0 + offset}),
+            Assert.assertEquals(new RowId(new Object[] { 0 + offset }),
                     container.firstItemId());
         }
     }
@@ -394,10 +392,10 @@ public class SQLContainerTableQueryTest {
 
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertEquals(
-                    new RowId(new Object[]{4999 + offset}).toString(),
+                    new RowId(new Object[] { 4999 + offset }).toString(),
                     container.lastItemId().toString());
         } else {
-            Assert.assertEquals(new RowId(new Object[]{4999 + offset}),
+            Assert.assertEquals(new RowId(new Object[] { 4999 + offset }),
                     container.lastItemId());
         }
     }
@@ -406,10 +404,10 @@ public class SQLContainerTableQueryTest {
     public void isFirstId_tableActualFirstId_returnsTrue() throws SQLException {
         if (SQLTestsConstants.db == DB.ORACLE) {
             assertTrue(container.isFirstId(new RowId(
-                    new Object[]{new BigDecimal(0 + offset)})));
+                    new Object[] { new BigDecimal(0 + offset) })));
         } else {
             assertTrue(container.isFirstId(new RowId(
-                    new Object[]{0 + offset})));
+                    new Object[] { 0 + offset })));
         }
     }
 
@@ -417,10 +415,10 @@ public class SQLContainerTableQueryTest {
     public void isFirstId_tableSecondId_returnsFalse() throws SQLException {
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertFalse(container.isFirstId(new RowId(
-                    new Object[]{new BigDecimal(1 + offset)})));
+                    new Object[] { new BigDecimal(1 + offset) })));
         } else {
             Assert.assertFalse(container.isFirstId(new RowId(
-                    new Object[]{1 + offset})));
+                    new Object[] { 1 + offset })));
         }
     }
 
@@ -428,10 +426,10 @@ public class SQLContainerTableQueryTest {
     public void isLastId_tableSecondId_returnsFalse() throws SQLException {
         if (SQLTestsConstants.db == DB.ORACLE) {
             Assert.assertFalse(container.isLastId(new RowId(
-                    new Object[]{new BigDecimal(1 + offset)})));
+                    new Object[] { new BigDecimal(1 + offset) })));
         } else {
             Assert.assertFalse(container.isLastId(new RowId(
-                    new Object[]{1 + offset})));
+                    new Object[] { 1 + offset })));
         }
     }
 
@@ -439,10 +437,10 @@ public class SQLContainerTableQueryTest {
     public void isLastId_tableLastId_returnsTrue() throws SQLException {
         if (SQLTestsConstants.db == DB.ORACLE) {
             assertTrue(container.isLastId(new RowId(
-                    new Object[]{new BigDecimal(3 + offset)})));
+                    new Object[] { new BigDecimal(3 + offset) })));
         } else {
-            assertTrue(container.isLastId(new RowId(
-                    new Object[]{3 + offset})));
+            assertTrue(container
+                    .isLastId(new RowId(new Object[] { 3 + offset })));
         }
     }
 
@@ -451,10 +449,10 @@ public class SQLContainerTableQueryTest {
         DataGenerator.addFiveThousandPeople(connectionPool);
         if (SQLTestsConstants.db == DB.ORACLE) {
             assertTrue(container.isLastId(new RowId(
-                    new Object[]{new BigDecimal(4999 + offset)})));
+                    new Object[] { new BigDecimal(4999 + offset) })));
         } else {
             assertTrue(container.isLastId(new RowId(
-                    new Object[]{4999 + offset})));
+                    new Object[] { 4999 + offset })));
         }
     }
 
@@ -862,6 +860,7 @@ public class SQLContainerTableQueryTest {
         assertTrue(garbageContainer.removeItem(first));
         Assert.assertSame(second, garbageContainer.firstItemId());
     }
+
     @Test
     public void lastItemId_tableLastItemRemoved_resultChanges()
             throws SQLException {
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/server/JSONSerializerTest.java b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
index 393cea1c4c..6c57445564 100644
--- a/server/tests/src/com/vaadin/server/JSONSerializerTest.java
+++ b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
@@ -57,8 +57,8 @@ public class JSONSerializerTest extends TestCase {
         stringToStateMap.put("string - state 1", s);
         stringToStateMap.put("String - state 2", s2);
 
-        JsonValue encodedMap = JsonCodec.encode(stringToStateMap, null, mapType,
-                null).getEncodedValue();
+        JsonValue encodedMap = JsonCodec.encode(stringToStateMap, null,
+                mapType, null).getEncodedValue();
 
         ensureDecodedCorrectly(stringToStateMap, encodedMap, mapType);
     }
@@ -74,8 +74,8 @@ public class JSONSerializerTest extends TestCase {
         stateToStringMap.put(s, "string - state 1");
         stateToStringMap.put(s2, "String - state 2");
 
-        JsonValue encodedMap = JsonCodec.encode(stateToStringMap, null, mapType,
-                null).getEncodedValue();
+        JsonValue encodedMap = JsonCodec.encode(stateToStringMap, null,
+                mapType, null).getEncodedValue();
 
         ensureDecodedCorrectly(stateToStringMap, encodedMap, mapType);
     }
diff --git a/server/tests/src/com/vaadin/server/VaadinGateInRequestTests.java b/server/tests/src/com/vaadin/server/VaadinGateInRequestTest.java
index 4478b4cf39..eda2b3a006 100644
--- a/server/tests/src/com/vaadin/server/VaadinGateInRequestTests.java
+++ b/server/tests/src/com/vaadin/server/VaadinGateInRequestTest.java
@@ -20,8 +20,8 @@ import static org.mockito.Mockito.spy;
 
 import com.vaadin.server.VaadinPortlet.VaadinGateInRequest;
 
-public class VaadinGateInRequestTests extends
-        VaadinHttpAndPortletRequestTests<VaadinGateInRequest> {
+public class VaadinGateInRequestTest extends
+        VaadinHttpAndPortletRequestTestBase<VaadinGateInRequest> {
 
     @Override
     protected VaadinGateInRequest createSut() {
diff --git a/server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTests.java b/server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
index a87eb1870e..0f7cce5f75 100644
--- a/server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTests.java
+++ b/server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
@@ -33,9 +33,7 @@ import org.junit.Test;
 import com.vaadin.server.VaadinPortlet.VaadinHttpAndPortletRequest;
 import com.vaadin.server.VaadinPortletService;
 
-//Have to ignore this class - otherwise JUnit tries to instantiate it...
-@Ignore
-public abstract class VaadinHttpAndPortletRequestTests<T extends VaadinHttpAndPortletRequest> {
+public abstract class VaadinHttpAndPortletRequestTestBase<T extends VaadinHttpAndPortletRequest> {
 
     protected VaadinHttpAndPortletRequest sut;
     protected HttpServletRequest servletRequest;
diff --git a/server/tests/src/com/vaadin/server/VaadinLiferayRequestTests.java b/server/tests/src/com/vaadin/server/VaadinLiferayRequestTest.java
index 8ccd649ea4..3024cd652f 100644
--- a/server/tests/src/com/vaadin/server/VaadinLiferayRequestTests.java
+++ b/server/tests/src/com/vaadin/server/VaadinLiferayRequestTest.java
@@ -20,8 +20,8 @@ import static org.mockito.Mockito.spy;
 
 import com.vaadin.server.VaadinPortlet.VaadinLiferayRequest;
 
-public class VaadinLiferayRequestTests extends
-        VaadinHttpAndPortletRequestTests<VaadinLiferayRequest> {
+public class VaadinLiferayRequestTest extends
+        VaadinHttpAndPortletRequestTestBase<VaadinLiferayRequest> {
 
     @Override
     protected VaadinLiferayRequest createSut() {
diff --git a/server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTests.java b/server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
index a1abfbd280..3a4c5c69be 100644
--- a/server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTests.java
+++ b/server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
@@ -20,8 +20,8 @@ import static org.mockito.Mockito.spy;
 
 import com.vaadin.server.VaadinPortlet.VaadinWebSpherePortalRequest;
 
-public class VaadinWebSpherePortalRequestTests extends
-        VaadinHttpAndPortletRequestTests<VaadinWebSpherePortalRequest> {
+public class VaadinWebSpherePortalRequestTest extends
+        VaadinHttpAndPortletRequestTestBase<VaadinWebSpherePortalRequest> {
 
     @Override
     protected VaadinWebSpherePortalRequest createSut() {
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/design/DesignReadInConstructor.java b/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.java
index ce80d98324..6eccaf6a2c 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.java
+++ b/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.java
@@ -15,12 +15,9 @@
  */
 package com.vaadin.tests.design;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.declarative.Design;
 
-@Ignore
 public class DesignReadInConstructor extends CssLayout {
 
     public DesignReadInConstructor() {
diff --git a/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java b/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
index bdfa4b47cc..8a2dec5a35 100644
--- a/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
+++ b/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.design;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Button;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.TextField;
@@ -27,7 +25,6 @@ import com.vaadin.ui.VerticalLayout;
  * @since
  * @author Vaadin Ltd
  */
-@Ignore
 public class InvalidLayoutTemplate extends VerticalLayout {
     private NativeButton firstButton;
     private NativeButton secondButton;
diff --git a/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java b/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
index 95f30fb728..fdfddf5c08 100644
--- a/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
+++ b/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.design;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Button;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.VerticalLayout;
@@ -27,7 +25,6 @@ import com.vaadin.ui.VerticalLayout;
  * @since
  * @author Vaadin Ltd
  */
-@Ignore
 public class LayoutTemplate extends VerticalLayout {
     private NativeButton firstButton; // assigned based on local id
     private NativeButton secondButton; // assigned based on id
diff --git a/server/tests/src/com/vaadin/tests/design/TestLocale.java b/server/tests/src/com/vaadin/tests/design/LocaleTest.java
index a4100f7d71..939080fbbc 100644
--- a/server/tests/src/com/vaadin/tests/design/TestLocale.java
+++ b/server/tests/src/com/vaadin/tests/design/LocaleTest.java
@@ -32,6 +32,11 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.declarative.Design;
 import com.vaadin.ui.declarative.DesignContext;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests the handling of the locale property in parsing and html generation.
@@ -39,10 +44,10 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestLocale extends TestCase {
+public class LocaleTest {
     DesignContext ctx;
 
-    @Override
+    @Before
     public void setUp() {
         ctx = new DesignContext();
     }
@@ -52,6 +57,7 @@ public class TestLocale extends TestCase {
      * constructed, the result only contains locale attributes for a component
      * if its locale differs from that of its parent.
      */
+    @Test
     public void testHtmlGeneration() {
         // create a component hierarchy
         VerticalLayout vLayout = new VerticalLayout();
@@ -130,6 +136,7 @@ public class TestLocale extends TestCase {
      * Checks that the locale of a component is set when the html element
      * corresponding to the component specifies a locale.
      */
+    @Test
     public void testParsing() {
         // create an html document
         Document doc = new Document("");
diff --git a/server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java b/server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
index 4f3f205631..5f901cd746 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
+++ b/server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
@@ -22,26 +22,28 @@ import junit.framework.TestCase;
 
 import com.vaadin.ui.declarative.Design;
 import com.vaadin.ui.declarative.DesignContext;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 
 /**
  * Just top level test case that contains all synchronizable components
  * 
  * @author Vaadin Ltd
  */
-public class ParseAllSupportedComponentsTest extends TestCase {
+public class ParseAllSupportedComponentsTest {
+
+    @Test
+    public void allComponentsAreParsed() throws FileNotFoundException {
+        DesignContext ctx = Design
+                .read(new FileInputStream(
+            "server/tests/src/com/vaadin/tests/design/all-components.html"),
+                        null);
 
-    public void testParsing() {
-        try {
-            DesignContext ctx = Design
-                    .read(new FileInputStream(
-                            "server/tests/src/com/vaadin/tests/design/all-components.html"),
-                            null);
-            assertNotNull("The returned design context can not be null", ctx);
-            assertNotNull("the component root can not be null",
-                    ctx.getRootComponent());
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            fail("Template parsing threw exception");
-        }
+        assertThat(ctx, is(not(nullValue())));
+        assertThat(ctx.getRootComponent(), is(not(nullValue())));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java b/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
index c517b0e5e2..70376c79f8 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
@@ -22,25 +22,27 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.TestCase;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
+import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.declarative.Design;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.*;
 
 /**
  * A test for checking that parsing a layout preserves the IDs and the mapping
@@ -50,45 +52,62 @@ import com.vaadin.ui.declarative.DesignException;
  * @since
  * @author Vaadin Ltd
  */
-public class ParseLayoutTest extends TestCase {
+public class ParseLayoutTest {
     // The context is used for accessing the created component hierarchy.
     private DesignContext ctx;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         ctx = Design
                 .read(new FileInputStream(
                         "server/tests/src/com/vaadin/tests/design/testFile.html"),
                         null);
     }
 
-    /*
-     * Checks the component hierarchy created by parsing a design. Also checks
-     * that components can be found by id and caption.
-     */
     @Test
-    public void testGettingByIDAndCaption() throws FileNotFoundException {
-        findElements(ctx);
-        checkHierarchy(ctx);
-    }
-
-    /*
-     * Check that captions, ids and package mappings are preserved when an html
-     * tree is generated from a DesignContext containing the component root of
-     * the component hierarchy. Done by writing the design to a string and then
-     * reading it back, not using the original context information after reading
-     * the written design. The mapping from prefixes to package names is checked
-     * directly from the html tree.
-     */
+    public void buttonWithIdIsParsed() {
+        Component button = ctx.getComponentByLocalId("firstButton");
+
+        assertThat(ctx.getComponentByCaption("Native click me"), is(button));
+        assertThat(button.getCaption(), is("Native click me"));
+    }
+
     @Test
-    public void testThatSerializationPreservesProperties() throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        Design.write(ctx, out);
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        DesignContext newContext = Design.read(in, null);
-        findElements(newContext);
-        checkHierarchy(newContext);
+    public void buttonWithIdAndLocalIdIsParsed() {
+        Component button = ctx.getComponentById("secondButton");
+
+        assertThat(ctx.getComponentByCaption("Another button"), is(button));
+        assertThat(ctx.getComponentByLocalId("localID"), is(button));
+        assertThat(button.getCaption(), is("Another button"));
+    }
+
+    @Test
+    public void buttonWithoutIdsIsParsed() {
+        assertThat(ctx.getComponentByCaption("Yet another button"),
+                is(not(nullValue())));
+    }
+
+    @Test
+    public void serializationPreservesProperties() throws IOException {
+        ByteArrayOutputStream out = serializeDesign(ctx);
+        ctx = deSerializeDesign(out);
+
+        assertButtonProperties();
+    }
+
+    @Test
+    public void serializationPreservesHierarchy() throws IOException {
+        ByteArrayOutputStream out = serializeDesign(ctx);
+        ctx = deSerializeDesign(out);
+
+        assertComponentHierarchy();
+    }
+
+    @Test
+    public void designIsSerializedWithCorrectPrefixesAndPackageNames()
+            throws IOException {
+        ByteArrayOutputStream out = serializeDesign(ctx);
+
         // Check the mapping from prefixes to package names using the html tree
         String[] expectedPrefixes = { "my" };
         String[] expectedPackageNames = { "com.addon.mypackage" };
@@ -114,13 +133,26 @@ public class ParseLayoutTest extends TestCase {
                 index);
     }
 
-    /*
-     * Check that the field binding works if root instance with member fields is
-     * passed to the LayoutHandler
-     * 
-     * @throws IOException
-     */
-    public void testFieldBinding() throws IOException {
+    private DesignContext deSerializeDesign(ByteArrayOutputStream out) {
+        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+        return Design.read(in, null);
+    }
+
+    private ByteArrayOutputStream serializeDesign(DesignContext context) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Design.write(context, out);
+
+        return out;
+    }
+
+    private void assertButtonProperties() {
+        buttonWithIdAndLocalIdIsParsed();
+        buttonWithIdIsParsed();
+        buttonWithoutIdsIsParsed();
+    }
+
+    @Test
+    public void fieldsAreBoundToATemplate() throws IOException {
         LayoutTemplate template = new LayoutTemplate();
         InputStream htmlFile = new FileInputStream(
                 "server/tests/src/com/vaadin/tests/design/testFile.html");
@@ -132,92 +164,59 @@ public class ParseLayoutTest extends TestCase {
         assertEquals("Native click me", template.getFirstButton().getCaption());
     }
 
-    /*
-     * Check that the field binding fails if some of the fields in the root
-     * instance were not bound
-     * 
-     * @throws IOException
-     */
-    public void testUnboundFields() throws IOException {
+    @Test(expected = DesignException.class)
+    public void fieldsCannotBeBoundToAnInvalidTemplate() throws IOException {
         InvalidLayoutTemplate template = new InvalidLayoutTemplate();
         InputStream htmlFile = new FileInputStream(
                 "server/tests/src/com/vaadin/tests/design/testFile.html");
-        try {
-            Design.read(htmlFile, template);
-            // we are expecting an exception
-            fail();
-        } catch (DesignException e) {
-            // expected
-        }
+
+        Design.read(htmlFile, template);
     }
 
-    /*
-     * Checks that the correct components occur in the correct order in the
-     * component hierarchy rooted at context.getComponentRoot().
-     */
-    private void checkHierarchy(DesignContext context) {
-        Component root = context.getRootComponent();
+    @Test
+    public void rootHasCorrectComponents() {
+        Component root = ctx.getRootComponent();
+
         VerticalLayout vlayout = (VerticalLayout) root;
-        int numComponents = vlayout.getComponentCount();
-        assertEquals("Wrong number of child components", 3, numComponents);
 
-        // Check the contents of the horizontal layout
+        assertThat(vlayout.getComponentCount(), is(3));
+    }
+
+    @Test
+    public void rootChildHasCorrectComponents() {
+        Component root = ctx.getRootComponent();
+        VerticalLayout vlayout = (VerticalLayout) root;
         HorizontalLayout hlayout = (HorizontalLayout) vlayout.getComponent(0);
-        int numHLComponents = hlayout.getComponentCount();
-        assertEquals(5, numHLComponents);
-        Label label = (Label) hlayout.getComponent(0);
-        assertEquals("Wrong caption.", "FooBar", label.getCaption());
-        NativeButton nb = (NativeButton) hlayout.getComponent(1);
-        assertEquals("Wrong caption.", "Native click me", nb.getCaption());
-        nb = (NativeButton) hlayout.getComponent(2);
-        assertEquals("Wrong caption.", "Another button", nb.getCaption());
-        nb = (NativeButton) hlayout.getComponent(3);
-        assertEquals("Wrong caption.", "Yet another button", nb.getCaption());
-        Button b = (Button) hlayout.getComponent(4);
-        assertEquals("Wrong caption.", "Click me", b.getCaption());
-        assertEquals("Wrong width.", 150f, b.getWidth());
+
+        assertThat(hlayout.getComponentCount(), is(5));
+        assertThat(hlayout.getComponent(0).getCaption(), is("FooBar"));
+        assertThat(hlayout.getComponent(1).getCaption(), is("Native click me"));
+        assertThat(hlayout.getComponent(2).getCaption(), is("Another button"));
+        assertThat(hlayout.getComponent(3).getCaption(), is("Yet another button"));
+        assertThat(hlayout.getComponent(4).getCaption(), is("Click me"));
+        assertThat(hlayout.getComponent(4).getWidth(), is(150f));
 
         // Check the remaining two components of the vertical layout
+        assertTextField(vlayout);
+        assertTextArea(vlayout);
+    }
+
+    private void assertComponentHierarchy() {
+        rootHasCorrectComponents();
+        rootChildHasCorrectComponents();
+    }
+
+    private void assertTextField(VerticalLayout vlayout) {
         TextField tf = (TextField) vlayout.getComponent(1);
-        assertEquals("Wrong caption.", "Text input", tf.getCaption());
-        TextArea ta = (TextArea) vlayout.getComponent(2);
-        assertEquals("Wrong caption.", "Text area", ta.getCaption());
-        assertEquals("Wrong width.", 300f, ta.getWidth());
-        assertEquals("Wrong height.", 200f, ta.getHeight());
-    }
-
-    /*
-     * Checks that the correct elements are found using a local id, a global id
-     * or a caption.
-     */
-    private void findElements(DesignContext designContext) {
-        NativeButton firstButton = (NativeButton) designContext
-                .getComponentByLocalId("firstButton");
-        NativeButton firstButton_2 = (NativeButton) designContext
-                .getComponentByCaption("Native click me");
-        NativeButton secondButton = (NativeButton) designContext
-                .getComponentById("secondButton");
-        NativeButton secondButton_2 = (NativeButton) designContext
-                .getComponentByLocalId("localID");
-        NativeButton secondButton_3 = (NativeButton) designContext
-                .getComponentByCaption("Another button");
-        NativeButton thirdButton = (NativeButton) designContext
-                .getComponentByCaption("Yet another button");
-        // Check that the first button was found using both identifiers.
-        assertEquals("The found buttons should be identical but they are not.",
-                firstButton, firstButton_2);
-        assertTrue("The found button element is incorrect.", firstButton
-                .getCaption().equals("Native click me"));
-        // Check that the second button was found using all three identifiers.
-        assertEquals("The found buttons should be identical but they are not.",
-                secondButton, secondButton_2);
-        assertEquals("The found buttons should be identical but they are not.",
-                secondButton_2, secondButton_3);
-        assertTrue("The found button is incorrect.", secondButton.getCaption()
-                .equals("Another button"));
-        // Check that the third button was found by caption.
-        assertTrue("The found button is incorrect.", thirdButton.getCaption()
-                .equals("Yet another button"));
+
+        assertThat(tf.getCaption(), is("Text input"));
     }
 
+    private void assertTextArea(VerticalLayout layout) {
+        TextArea ta = (TextArea) layout.getComponent(2);
+
+        assertThat(ta.getCaption(), is("Text area"));
+        assertThat(ta.getWidth(), is(300f));
+        assertThat(ta.getHeight(), is(200f));
+    }
 }
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java b/server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
index 70809cb694..ef9de9dcb0 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
+++ b/server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.design.designroot;
 
-import org.junit.Ignore;
-
 import com.vaadin.annotations.DesignRoot;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
@@ -24,7 +22,6 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.declarative.Design;
 
 @DesignRoot("DesignWithEmptyAnnotation.html")
-@Ignore
 public class DesignWithAnnotation extends VerticalLayout {
 
     public Button ok;
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java b/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
index f6fb928e75..55fd571ee2 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
+++ b/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.design.designroot;
 
-import org.junit.Ignore;
-
 import com.vaadin.annotations.DesignRoot;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
@@ -24,7 +22,6 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.declarative.Design;
 
 @DesignRoot
-@Ignore
 public class DesignWithEmptyAnnotation extends VerticalLayout {
 
     protected Button ok;
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java b/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
index 14e4269e80..d47b4540df 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
+++ b/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
@@ -15,11 +15,8 @@
  */
 package com.vaadin.tests.design.designroot;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.TextField;
 
-@Ignore
 public class ExtendedDesignWithAnnotation extends DesignWithAnnotation {
     private TextField customField = new TextField();
 
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java b/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
index 22865b098c..ea513f6d3e 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
+++ b/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
@@ -15,14 +15,11 @@
  */
 package com.vaadin.tests.design.designroot;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.TextField;
 
-@Ignore
 public class ExtendedDesignWithEmptyAnnotation extends
         DesignWithEmptyAnnotation {
 
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java b/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
index 34f517d25d..1d0e8de4eb 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
+++ b/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
@@ -15,12 +15,9 @@
  */
 package com.vaadin.tests.design.designroot;
 
-import org.junit.Ignore;
-
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.UI;
 
-@Ignore
 public class ExtendedDesignWithEmptyAnnotationUI extends UI {
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java b/server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java
index e85c0aca5f..3b0d80c32c 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.design.nested;
 
-import org.junit.Ignore;
-
 import com.vaadin.annotations.DesignRoot;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
@@ -27,7 +25,6 @@ import com.vaadin.ui.declarative.Design;
  * 
  * @author Vaadin Ltd
  */
-@Ignore
 @DesignRoot("mychilddesign.html")
 public class MyChildDesign extends HorizontalLayout {
     public Label childLabel;
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java b/server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
index 94e34baea2..8402224cf9 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
@@ -15,11 +15,8 @@
  */
 package com.vaadin.tests.design.nested;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Button;
 
-@Ignore
 public class MyChildDesignCustomComponent extends Button {
 
 }
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java b/server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java
index 5727322ce3..abde002ef8 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.design.nested;
 
-import org.junit.Ignore;
-
 import com.vaadin.annotations.DesignRoot;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.declarative.Design;
@@ -26,7 +24,6 @@ import com.vaadin.ui.declarative.Design;
  * 
  * @author Vaadin Ltd
  */
-@Ignore
 @DesignRoot("mydesignroot.html")
 public class MyDesignRoot extends VerticalLayout {
     // should be assigned automatically
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java b/server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
index 2012e4ec14..579fdfb869 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
@@ -15,9 +15,6 @@
  */
 package com.vaadin.tests.design.nested;
 
-import org.junit.Ignore;
-
-@Ignore
 public class MyExtendedChildDesign extends MyChildDesign {
     public MyExtendedChildDesign() {
         super();
diff --git a/server/tests/src/com/vaadin/tests/design/nested/TestNestedCustomLayouts.java b/server/tests/src/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
index c71ccca85b..beaa9519cb 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/TestNestedCustomLayouts.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
@@ -15,29 +15,20 @@
  */
 package com.vaadin.tests.design.nested;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
+import com.vaadin.tests.design.nested.customlayouts.*;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.declarative.Design;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.junit.Test;
 
-import com.vaadin.tests.design.nested.customlayouts.CustomAbsoluteLayout;
-import com.vaadin.tests.design.nested.customlayouts.CustomAccordion;
-import com.vaadin.tests.design.nested.customlayouts.CustomCssLayout;
-import com.vaadin.tests.design.nested.customlayouts.CustomFormLayout;
-import com.vaadin.tests.design.nested.customlayouts.CustomGridLayout;
-import com.vaadin.tests.design.nested.customlayouts.CustomHorizontalLayout;
-import com.vaadin.tests.design.nested.customlayouts.CustomHorizontalSplitPanel;
-import com.vaadin.tests.design.nested.customlayouts.CustomPanel;
-import com.vaadin.tests.design.nested.customlayouts.CustomTabSheet;
-import com.vaadin.tests.design.nested.customlayouts.CustomVerticalLayout;
-import com.vaadin.tests.design.nested.customlayouts.CustomVerticalSplitPanel;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.declarative.Design;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
 
 /**
  * Test case for nested custom layouts. The children of the custom layouts must
@@ -45,12 +36,24 @@ import com.vaadin.ui.declarative.Design;
  * 
  * @author Vaadin Ltd
  */
-public class TestNestedCustomLayouts extends TestCase {
+public class NestedCustomLayoutsTest {
 
     private static String PACKAGE_MAPPING = "com_vaadin_tests_design_nested_customlayouts:com.vaadin.tests.design.nested.customlayouts";
 
     @Test
     public void testNestedLayouts() throws IOException {
+        VerticalLayout rootLayout = createRootLayout();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        Design.write(rootLayout, out);
+        Document doc = Jsoup.parse(out.toString("UTF-8"));
+
+        assertThat(doc.head().child(0).attr("name"), is("package-mapping"));
+        assertThat(doc.head().child(0).attr("content"), is(PACKAGE_MAPPING));
+        assertChildrenCount(doc);
+    }
+
+    private VerticalLayout createRootLayout() {
         VerticalLayout rootLayout = new VerticalLayout();
         rootLayout.addComponent(new CustomAbsoluteLayout());
         rootLayout.addComponent(new CustomAccordion());
@@ -63,18 +66,17 @@ public class TestNestedCustomLayouts extends TestCase {
         rootLayout.addComponent(new CustomTabSheet());
         rootLayout.addComponent(new CustomVerticalLayout());
         rootLayout.addComponent(new CustomVerticalSplitPanel());
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        Design.write(rootLayout, out);
-        Document doc = Jsoup.parse(out.toString("UTF-8"));
-        assertEquals("package-mapping", doc.head().child(0).attr("name"));
-        assertEquals(PACKAGE_MAPPING, doc.head().child(0).attr("content"));
+
+        return rootLayout;
+    }
+
+    private void assertChildrenCount(Document doc) {
         Element rootNode = doc.body().child(0);
-        assertTrue("Root node must have children",
-                rootNode.children().size() > 0);
+        assertThat(rootNode.children().size(), greaterThan(0));
+
         for (Element child : rootNode.children()) {
             // make sure that the nested custom layouts do not render children
-            assertEquals("Child nodes must not have children", 0, child
-                    .children().size());
+            assertThat(child.children().size(), is(0));
         }
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java b/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
new file mode 100644
index 0000000000..dc95306cd3
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.design.nested;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.*;
+
+/**
+ * Test case for reading nested templates
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class ReadNestedTemplatesTest {
+
+    private MyDesignRoot root;
+
+    @Before
+    public void setUp() {
+        root = new MyDesignRoot();
+    }
+
+    @Test
+    public void rootContainsOneChild() {
+        assertThat(root.getComponentCount(), is(1));
+        assertThat(root.iterator().next(),
+                instanceOf(MyExtendedChildDesign.class));
+    }
+
+    @Test
+    public void rootContainsTwoGrandChildren() {
+        assertThat(root.childDesign.getComponentCount(), is(2));
+    }
+
+    @Test
+    public void childComponentIsNotNull() {
+        assertThat(root.childDesign, is(not(nullValue())));
+    }
+
+    @Test
+    public void childLabelIsNotNull() {
+        assertThat(root.childDesign.childLabel, is(not(nullValue())));
+        assertThat(root.childDesign.childLabel.getValue(), is("test content"));
+    }
+
+    @Test
+    public void childCustomComponentsIsNotNull() {
+        assertThat(root.childDesign.childCustomComponent, is(not(nullValue())));
+        assertThat(root.childDesign.childCustomComponent.getCaption(),
+                is("custom content"));
+    }
+}
diff --git a/server/tests/src/com/vaadin/tests/design/nested/TestReadNestedTemplates.java b/server/tests/src/com/vaadin/tests/design/nested/TestReadNestedTemplates.java
deleted file mode 100644
index c1483adc8a..0000000000
--- a/server/tests/src/com/vaadin/tests/design/nested/TestReadNestedTemplates.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.design.nested;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for reading nested templates
- * 
- * @since
- * @author Vaadin Ltd
- */
-public class TestReadNestedTemplates extends TestCase {
-
-    private MyDesignRoot root;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        root = new MyDesignRoot();
-    }
-
-    public void testChildren() {
-        assertEquals("The root layout must contain one child", 1,
-                root.getComponentCount());
-        assertTrue(root.iterator().next() instanceof MyExtendedChildDesign);
-    }
-
-    public void testGrandChildren() {
-        assertEquals("The root layout must have two grandchildren", 2,
-                root.childDesign.getComponentCount());
-    }
-
-    public void testRootComponentFields() {
-        assertNotNull("The child component must not be null", root.childDesign);
-    }
-
-    public void testChildComponentFields() {
-        assertNotNull("Grandchildren must not be null",
-                root.childDesign.childLabel);
-        assertNotNull("Grandchildren must not be null",
-                root.childDesign.childCustomComponent);
-        assertEquals("child label caption must be read", "test content",
-                root.childDesign.childLabel.getValue());
-        assertEquals("child custom component caption must be read",
-                "custom content",
-                root.childDesign.childCustomComponent.getCaption());
-    }
-}
diff --git a/server/tests/src/com/vaadin/tests/design/nested/TestWriteNestedTemplates.java b/server/tests/src/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
index 7fe63baa73..344cd94ac2 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/TestWriteNestedTemplates.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
@@ -15,13 +15,15 @@
  */
 package com.vaadin.tests.design.nested;
 
-import junit.framework.TestCase;
-
+import com.vaadin.ui.declarative.DesignContext;
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Tag;
+import org.junit.Before;
+import org.junit.Test;
 
-import com.vaadin.ui.declarative.DesignContext;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
 
 /**
  * 
@@ -29,21 +31,29 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteNestedTemplates extends TestCase {
+public class WriteNestedTemplatesTest {
 
     private MyDesignRoot root;
     private Element design;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         root = new MyDesignRoot();
         design = createDesign();
+    }
+
+    private Element createDesign() {
+        Element design = new Element(Tag.valueOf("v-vertical-layout"), "",
+                new Attributes());
+
         DesignContext designContext = new DesignContext();
         designContext.setRootComponent(root);
         root.writeDesign(design, designContext);
+
+        return design;
     }
 
+    @Test
     public void testChildRendered() {
         assertEquals("Root layout must have one child", 1, design.children()
                 .size());
@@ -51,39 +61,29 @@ public class TestWriteNestedTemplates extends TestCase {
                 design.child(0).tagName());
     }
 
-    public void testRootCaptionWritten() {
-        assertTrue("Root layout caption must be written",
-                design.hasAttr("caption"));
-        assertEquals("Root layout caption must be written", "root caption",
-                design.attr("caption"));
+    @Test
+    public void rootCaptionIsWritten() {
+        assertTrue(design.hasAttr("caption"));
+        assertThat(design.attr("caption"), is("root caption"));
     }
 
-    public void testChildCaptionWritten() {
-        assertTrue("Child design caption must be written", design.child(0)
-                .hasAttr("caption"));
-        assertEquals("Child design caption must be written", "child caption",
-                design.child(0).attr("caption"));
+    @Test
+    public void childCaptionIsWritten() {
+        assertTrue(design.child(0).hasAttr("caption"));
+        assertThat(design.child(0).attr("caption"), is("child caption"));
     }
 
     // The default caption is read from child template
-    public void testDefaultCaptionShouldNotBeWritten() {
-        design = createDesign();
+    @Test
+    public void defaultCaptionIsNotOverwritten() {
         root.childDesign.setCaption("Default caption for child design");
-        DesignContext designContext = new DesignContext();
-        designContext.setRootComponent(root);
-        root.writeDesign(design, designContext);
-        assertFalse("Default caption must not be written", design.child(0)
-                .hasAttr("caption"));
-    }
+        design = createDesign();
 
-    public void testChildDesignChildrenNotWrittenInRootTemplate() {
-        assertEquals(
-                "Children of the child template must not be written to root template",
-                0, design.child(0).children().size());
+        assertFalse(design.child(0).hasAttr("caption"));
     }
 
-    private Element createDesign() {
-        return new Element(Tag.valueOf("v-vertical-layout"), "",
-                new Attributes());
+    @Test
+    public void childDesignChildrenIsNotWrittenInRootTemplate() {
+        assertThat(design.child(0).children().size(), is(0));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
index ed2b27215e..8eef3b07a6 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomAbsoluteLayout extends AbsoluteLayout {
     public CustomAbsoluteLayout() {
         this.addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
index 7d45917520..93606f296c 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomAccordion extends Accordion {
     public CustomAccordion() {
         addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
index 328a025e01..b2aaa2c015 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomCssLayout extends CssLayout {
     public CustomCssLayout() {
         this.addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
index 179b195926..66ac083c0d 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomFormLayout extends FormLayout {
     public CustomFormLayout() {
         this.addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
index 0b3b90ca1f..1059ea0e14 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomGridLayout extends GridLayout {
     public CustomGridLayout() {
         this.addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
index b742f7c629..482a9feb95 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomHorizontalLayout extends HorizontalLayout {
     public CustomHorizontalLayout() {
         this.addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
index deeb311858..21c8745796 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomHorizontalSplitPanel extends HorizontalSplitPanel {
     public CustomHorizontalSplitPanel() {
         addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
index fa7827bdfd..5841fbcfee 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomPanel extends Panel {
     public CustomPanel() {
         setContent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
index 6298b67727..128de7de1f 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomTabSheet extends TabSheet {
     public CustomTabSheet() {
         addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
index 7859ae0227..3bc8fba7de 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomVerticalLayout extends VerticalLayout {
     public CustomVerticalLayout() {
         this.addComponent(new Label());
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
index f6eb460c1b..486d71ea75 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.tests.design.nested.customlayouts;
 
-import org.junit.Ignore;
-
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalSplitPanel;
 
 /**
  * @author Vaadin Ltd
  */
-@Ignore
 public class CustomVerticalSplitPanel extends VerticalSplitPanel {
     public CustomVerticalSplitPanel() {
         addComponent(new Label());
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 ad70024af4..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,
@@ -71,7 +71,8 @@ public class TestClientMethodSerialization extends TestCase {
 
         ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize(original);
         JsonArray copyArray = (JsonArray) copy.getParameters()[1];
-        assertEquals(JsonUtil.stringify(originalArray), JsonUtil.stringify(copyArray));
+        assertEquals(JsonUtil.stringify(originalArray),
+                JsonUtil.stringify(copyArray));
     }
 
     public void testClientMethodSerialization_WithBasicParams_NoChanges()
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 {