[4/6] wicket git commit: Removed all the replicated WicktTestCase classes. Only the one from wicket-core has been left

[adelbene]

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
index 5e9e727..62a84ff 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
@@ -24,7 +24,6 @@ import org.apache.wicket.Page;
 import org.apache.wicket.RequestListenerInterface;
 import org.apache.wicket.Session;
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -36,6 +35,7 @@ import org.apache.wicket.resource.DummyPage;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
index dbd8739..b91873b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket.core.request.mapper;
 import org.apache.wicket.MockPage;
 import org.apache.wicket.Page;
 import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.WicketTestCase;
 import 
org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy;
 import org.apache.wicket.mock.MockApplication;
 import org.apache.wicket.protocol.http.PageExpiredException;
@@ -27,6 +26,7 @@ import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.mapper.info.PageInfo;
+import org.apache.wicket.util.tester.WicketTestCase;
 import 
org.apache.wicket.util.tester.WicketTesterLazyIsPageStatelessRedirectToBufferTest.EmptyPage;
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
index a0e3512..6603c7b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
@@ -20,7 +20,6 @@ import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.IRequestMapper;
 import org.apache.wicket.request.Request;
@@ -31,6 +30,7 @@ import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.request.resource.SharedResourceReference;
 import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
index 9d12d88..8752d2d 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
@@ -23,10 +23,10 @@ import java.io.OutputStream;
 import org.apache.wicket.Component;
 import org.apache.wicket.MockPageWithLink;
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.markup.html.form.login.MockHomePage;
 import org.apache.wicket.serialize.java.JavaSerializer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 public class DifferentPageCheckerTest extends WicketTestCase

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
index cad9387..96c9df7 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
@@ -17,9 +17,9 @@
 package org.apache.wicket.core.util.objects.checker;
 
 import org.apache.wicket.TestPage_1;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
index f43da30..2e85e1c 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
@@ -21,12 +21,12 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
 import org.apache.wicket.Session;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.mock.MockWebRequest;
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.serialize.java.JavaSerializer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 public class SessionCheckerTest extends WicketTestCase

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
index c3ac327..3167209 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
@@ -20,9 +20,9 @@ import static 
org.apache.wicket.util.resource.ResourceStreamLocatorTest.*;
 
 import java.io.File;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 public class ClassPathResourceFinderTest extends WicketTestCase

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
index 43a4214..56573b0 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.core.util.string.componentrenderer;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.core.util.string.ComponentRenderer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
 
b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
index b56304e..668bd58 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
@@ -18,7 +18,6 @@ package org.apache.wicket.dontstoreunrendered;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.IPageManagerProvider;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.application.IComponentInstantiationListener;
 import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.mock.MockPageManager;
@@ -26,6 +25,7 @@ import org.apache.wicket.page.IManageablePage;
 import org.apache.wicket.page.IPageManager;
 import org.apache.wicket.page.IPageManagerContext;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java 
b/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
index c41b6c1..8f0f7cb 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
@@ -17,7 +17,7 @@
 package org.apache.wicket.feedback;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
index 19b86b3..f6ac2ee 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.wicket.intercept;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
index cb9bc3b..222244e 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
@@ -17,12 +17,12 @@
 package org.apache.wicket.markup;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
index f02852d..909a2ec 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
@@ -18,8 +18,8 @@ package org.apache.wicket.markup;
 
 import java.util.Locale;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
index 137fb03..c9215ea 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
@@ -17,9 +17,9 @@
 package org.apache.wicket.markup;
 
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.parser.filter.HtmlProblemFinder;
 import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
index 24c4c54..8a8b9d2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
@@ -18,10 +18,10 @@ package org.apache.wicket.markup;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
index 155dc2c..e0b59ef 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
index da82cff..edc4c4b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.wicket.markup;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.util.tester.DiffUtil;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
index 67e42f0..30d9268 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
@@ -21,7 +21,6 @@ import java.text.ParseException;
 import java.util.Locale;
 import java.util.regex.Matcher;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
 import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
 import org.apache.wicket.markup.html.border.Border;
@@ -31,6 +30,7 @@ import 
org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
 import org.apache.wicket.util.string.StringValueConversionException;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
index f1a162e..d5e6368 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
index 195ff8f..65cc4d2 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.WebPage;
@@ -26,6 +25,7 @@ import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
index 490a0e8..57f2c08 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
@@ -23,7 +23,6 @@ import java.util.List;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.repeater.Item;
@@ -33,6 +32,7 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
index ce9df71..35bf4f2 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
index ac4ed01..ab86f6a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.markup.head;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.header.response.ConcretePage;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
index 5e695a5..6c50132 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
@@ -18,13 +18,13 @@ package org.apache.wicket.markup.head.filter;
 
 import java.util.Collections;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.StringHeaderItem;
 import org.apache.wicket.markup.head.internal.HeaderResponse;
 import org.apache.wicket.markup.html.IHeaderResponseDecorator;
 import org.apache.wicket.request.Response;
 import org.apache.wicket.response.StringResponse;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
index f487589..cb16c69 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
@@ -17,12 +17,11 @@
 package org.apache.wicket.markup.html;
 
 import org.junit.Assert;
-
 import org.apache.wicket.Component;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.panel.EmptyPanel;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
index d88fed6..7a8b533 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.text.ParseException;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -32,6 +31,7 @@ import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
index 4431d48..867dc07 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxCallListener;
@@ -30,6 +29,7 @@ import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
index ba5598f..7d54d4a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
@@ -18,13 +18,13 @@ package org.apache.wicket.markup.html;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
index bcbcd69..42669a7 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html;
 
 import java.io.File;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
index 19624c7..63d6b6a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
@@ -20,13 +20,13 @@ import java.util.Locale;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.SharedResources;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.resource.JavaScriptPackageResource;
 import org.apache.wicket.request.resource.PackageResource;
 import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.util.lang.Packages;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
index 5b8fb9a..9507d0a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
@@ -17,8 +17,8 @@
 package org.apache.wicket.markup.html;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.util.lang.Packages;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
index 4905aa9..6b3bd5f 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html;
 
 import org.apache.wicket.IPageManagerProvider;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.core.util.lang.WicketObjects;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.MarkupException;
@@ -30,6 +29,7 @@ import org.apache.wicket.page.IPageManager;
 import org.apache.wicket.page.IPageManagerContext;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
index b03669d..1d4e256 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
@@ -19,13 +19,13 @@ package org.apache.wicket.markup.html;
 import static org.hamcrest.CoreMatchers.instanceOf;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.page.IManageablePage;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
index 3b4b79f..dba8b4b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
@@ -17,11 +17,11 @@
 package org.apache.wicket.markup.html;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.Markup;
 import org.apache.wicket.markup.MarkupType;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
index ef5843a..ba36883 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.wicket.markup.html.autocomponent;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupCache;
 import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /*

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
index 8864a36..23865c8 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
@@ -17,10 +17,10 @@
 package org.apache.wicket.markup.html.autolink;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.autolink.sub.LogoPanel;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
index 21ca99d..1aa6139 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.markup.html.autolink;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.autolink.sub.PageB;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
index dae082c..6c1c550 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.markup.html.basic;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.util.tester.DiffUtil;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
index fa0facc..000136b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.basic;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
index f9f0ffd..8e8de92 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.wicket.markup.html.basic;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.MarkupException;
 import org.apache.wicket.markup.MarkupNotFoundException;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.border.Border;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.value.ValueMap;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
index 3a7700d..54fa671 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
@@ -18,8 +18,8 @@ package org.apache.wicket.markup.html.basic;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
index 1e03dba..dbfd25f 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
@@ -17,11 +17,11 @@
 package org.apache.wicket.markup.html.basic;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.resource.IPropertiesFactory;
 import org.apache.wicket.resource.IsoPropertiesFilePropertiesLoader;
 import org.apache.wicket.resource.PropertiesFactory;
 import org.apache.wicket.resource.XmlFilePropertiesLoader;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
index 86f2864..35a0a12 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
@@ -17,9 +17,9 @@
 package org.apache.wicket.markup.html.border;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
index 5b014ae..5d33954 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.debug;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
index 1b8217d..cef3a4a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket.markup.html.form;
 import java.util.Locale;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.PropertyModel;
@@ -27,6 +26,7 @@ import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
index caa592b..204f949 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
@@ -20,10 +20,10 @@ import java.util.Locale;
 
 import org.apache.wicket.Page;
 import org.apache.wicket.Session;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
index d4416a7..cee2003 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
@@ -17,11 +17,11 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.Markup;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
index 1f66dcc..0cef9a8 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
index ed4c5d9..dac1263 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 @SuppressWarnings({ "rawtypes", "serial", "unchecked" })

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
index 1f448d8..c1bd5be 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.CompoundPropertyModel;
@@ -26,6 +25,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
index e2d9cad..81a262f 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
@@ -19,11 +19,11 @@ package org.apache.wicket.markup.html.form;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.Markup;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
index e88e30c..9c0da29 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
index 80849df..a208b2d 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
@@ -23,9 +23,9 @@ import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
index d25972d..979ba16 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
index ac1792a..feb8404 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.form;
 
 import java.util.Locale;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
index ba29ebd..75e9826 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket.markup.html.form;
 import java.io.Serializable;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
@@ -27,6 +26,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
index 86f47f3..3a84940 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
@@ -17,13 +17,12 @@
 package org.apache.wicket.markup.html.form;
 
 import org.junit.Assert;
-
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.validation.INullAcceptingValidator;
 import org.apache.wicket.validation.IValidatable;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
index fb0c6c5..63a6cc5 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
@@ -17,10 +17,10 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.tester.WicketTestCase;
 import 
org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
index 24c0447..29bea53 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 public class FormSubmitOrderTest extends WicketTestCase

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
index 866e96f..2c53348 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
@@ -17,10 +17,10 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.WicketTestCase;
 import 
org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
 import org.apache.wicket.markup.html.form.NestedFormsPage.NestableForm;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
index e63458d..05344a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
@@ -18,13 +18,13 @@ package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.MockPageParametersAware;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.visit.IVisitor;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
index 325305c..faf9d7f 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket.markup.html.form;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.feedback.IFeedbackMessageFilter;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
@@ -29,6 +28,7 @@ import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
index 197914d..3f94112 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
@@ -21,13 +21,13 @@ import java.util.List;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
index ea57bbd..3987a58 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.util.ListModel;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 public class ListMultipleChoiceTest extends WicketTestCase

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
index 06c393b..57795d2 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.form;
 
 import java.util.Locale;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
index b7c4417..631865e 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
index 2bb0767..6b5b8c4 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
@@ -21,12 +21,12 @@ import java.util.List;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
index bb951d5..76dea67 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
@@ -20,13 +20,13 @@ import java.math.BigDecimal;
 import java.util.Locale;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
index b55ad57..ff2fc80 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
@@ -19,10 +19,10 @@ package org.apache.wicket.markup.html.form;
 import static org.hamcrest.CoreMatchers.is;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
 import 
org.apache.wicket.markup.html.form.onFormValidateModelObjects.AddressFormPanel;
 import 
org.apache.wicket.markup.html.form.onFormValidateModelObjects.OnFormValidateModelObjectsPage;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
index c6f07ab..db1520a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
@@ -17,7 +17,7 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
index ed5151f..f47f043 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.form;
 
 import java.util.Arrays;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 public class RadioChoiceTest extends WicketTestCase

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
index c5371b6..6165a02 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
@@ -17,8 +17,8 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
index c451e81..a065110 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
index f8ad5d9..a75bcd3 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.HTML5Attributes;
 import org.apache.wicket.markup.html.WebPage;
@@ -26,6 +25,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
index 659a27e..5af5917 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
@@ -17,7 +17,6 @@
 package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.HTML5Attributes;
 import org.apache.wicket.markup.html.WebPage;
@@ -28,6 +27,7 @@ import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.tester.FormTester;
 import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.validation.validator.StringValidator;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
index 552893e..e4231c8 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
@@ -19,10 +19,10 @@ package org.apache.wicket.markup.html.form;
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.properties.MyApplication;
 import org.apache.wicket.properties.TestPage;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
index e321e77..aa909bf 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
@@ -16,9 +16,9 @@
  */
 package org.apache.wicket.markup.html.form.border;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
index 0e2cd49..72dcf83 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.markup.html.form.border;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
index 72024c6..1211580 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.wicket.markup.html.form.encryption;
 
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.util.crypt.ICrypt;
 import org.apache.wicket.util.crypt.NoCrypt;
 import org.apache.wicket.util.crypt.SunJceCrypt;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
index 1e231c8..2f50b5c 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
@@ -17,7 +17,7 @@
 package org.apache.wicket.markup.html.form.feedback;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
index 8b80868..0137cf8 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.form.formComponentPanel;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
index a035d74..1239848 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.form.imagebutton;
 
 import java.util.Locale;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
index d5821fa..acfcf96 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.form.imagebutton;
 
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
index ae441b5..6eb693b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket.markup.html.form.login;
 import org.apache.wicket.Page;
 import org.apache.wicket.RestartResponseAtInterceptPageException;
 import org.apache.wicket.Session;
-import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.authorization.IAuthorizationStrategy;
 import org.apache.wicket.mock.MockApplication;
 import org.apache.wicket.protocol.http.WebApplication;
@@ -29,6 +28,7 @@ import org.apache.wicket.request.Response;
 import org.apache.wicket.request.component.IRequestableComponent;
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.junit.Test;