2 files changed, 3 insertions, 4 deletions
diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index e6d84a2b83..d8d1521a4c 100644
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -29,8 +29,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         servlet = new VaadinServlet();
 
         // Workaround to avoid calling init and creating servlet config
-        Field f = VaadinServlet.class
-                .getDeclaredField("deploymentConfiguration");
+        Field f = VaadinServlet.class.getDeclaredField("servletService");
         f.setAccessible(true);
         f.set(servlet, new ServletService(servlet,
                 new DefaultApplicationConfiguration(servlet.getClass(),
diff --git a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index 2b4676bc42..acc89895ef 100644
--- a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -72,13 +72,13 @@ public class CustomUIClassLoader extends TestCase {
     }
 
     private static WrappedRequest createRequestMock(ClassLoader classloader) {
-        // Mock a DeploymentConfiguration to give the passed classloader
+        // Mock a VaadinService to give the passed classloader
         VaadinService configurationMock = EasyMock
                 .createMock(VaadinService.class);
         EasyMock.expect(configurationMock.getClassLoader()).andReturn(
                 classloader);
 
-        // Mock a WrappedRequest to give the mocked deployment configuration
+        // Mock a WrappedRequest to give the mocked vaadin service
         WrappedRequest requestMock = EasyMock.createMock(WrappedRequest.class);
         EasyMock.expect(requestMock.getVaadinService()).andReturn(
                 configurationMock);