diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index ea71124a1d..1bb319a7f4 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -202,7 +202,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.CustomLayoutDemo</param-value>
+      <param-value>com.itmill.toolkit.tests.CustomLayoutDemo</param-value>
     </init-param>
   </servlet>
 
@@ -211,7 +211,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.LayoutDemo</param-value>
+      <param-value>com.itmill.toolkit.tests.LayoutDemo</param-value>
     </init-param>
   </servlet>
 
@@ -238,7 +238,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.Parameters</param-value>
+      <param-value>com.itmill.toolkit.tests.Parameters</param-value>
     </init-param>
   </servlet>
 
@@ -247,7 +247,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.UpgradingSample</param-value>
+      <param-value>com.itmill.toolkit.tests.UpgradingSample</param-value>
     </init-param>
   </servlet>
 
@@ -256,7 +256,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.QueryContainerDemo</param-value>
+      <param-value>com.itmill.toolkit.tests.QueryContainerDemo</param-value>
     </init-param>
   </servlet>
   
@@ -265,7 +265,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.TreeFilesystemContainer</param-value>
+      <param-value>com.itmill.toolkit.tests.TreeFilesystemContainer</param-value>
     </init-param>
     <!-- Set this property if demo cannot access context base directory
       because of Application Server or Servlet Container security constraints-->
@@ -282,7 +282,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.TreeFilesystem</param-value>
+      <param-value>com.itmill.toolkit.tests.TreeFilesystem</param-value>
     </init-param>
     <!-- Set this property if demo cannot access context base directory
       because of Application Server or Servlet Container security constraints-->
@@ -299,7 +299,7 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
       <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.ModalWindow</param-value>
+      <param-value>com.itmill.toolkit.tests.ModalWindow</param-value>
     </init-param>
   </servlet>
 
diff --git a/src/com/itmill/toolkit/demo/CustomLayoutDemo.java b/src/com/itmill/toolkit/tests/CustomLayoutDemo.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/CustomLayoutDemo.java
rename to src/com/itmill/toolkit/tests/CustomLayoutDemo.java
index b683fc763a..0409a81e66 100644
--- a/src/com/itmill/toolkit/demo/CustomLayoutDemo.java
+++ b/src/com/itmill/toolkit/tests/CustomLayoutDemo.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomLayout;
diff --git a/src/com/itmill/toolkit/demo/LayoutDemo.java b/src/com/itmill/toolkit/tests/LayoutDemo.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/LayoutDemo.java
rename to src/com/itmill/toolkit/tests/LayoutDemo.java
index 7cf86f4c11..132c1a8548 100644
--- a/src/com/itmill/toolkit/demo/LayoutDemo.java
+++ b/src/com/itmill/toolkit/tests/LayoutDemo.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.ui.Component;
diff --git a/src/com/itmill/toolkit/demo/ModalWindow.java b/src/com/itmill/toolkit/tests/ModalWindow.java
similarity index 98%
rename from src/com/itmill/toolkit/demo/ModalWindow.java
rename to src/com/itmill/toolkit/tests/ModalWindow.java
index c394c1ec62..70edf029f6 100644
--- a/src/com/itmill/toolkit/demo/ModalWindow.java
+++ b/src/com/itmill/toolkit/tests/ModalWindow.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.Label;
diff --git a/src/com/itmill/toolkit/demo/NativeWindowing.java b/src/com/itmill/toolkit/tests/NativeWindowing.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/NativeWindowing.java
rename to src/com/itmill/toolkit/tests/NativeWindowing.java
index 7dadd7c4bb..04f54194b1 100644
--- a/src/com/itmill/toolkit/demo/NativeWindowing.java
+++ b/src/com/itmill/toolkit/tests/NativeWindowing.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/src/com/itmill/toolkit/demo/Parameters.java b/src/com/itmill/toolkit/tests/Parameters.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/Parameters.java
rename to src/com/itmill/toolkit/tests/Parameters.java
index 5c306b6461..e0ff6759f2 100644
--- a/src/com/itmill/toolkit/demo/Parameters.java
+++ b/src/com/itmill/toolkit/tests/Parameters.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import java.net.URL;
 import java.util.Iterator;
diff --git a/src/com/itmill/toolkit/demo/QueryContainerDemo.java b/src/com/itmill/toolkit/tests/QueryContainerDemo.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/QueryContainerDemo.java
rename to src/com/itmill/toolkit/tests/QueryContainerDemo.java
index ef7a8ca5a9..1ace2988f8 100644
--- a/src/com/itmill/toolkit/demo/QueryContainerDemo.java
+++ b/src/com/itmill/toolkit/tests/QueryContainerDemo.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import java.sql.SQLException;
 
diff --git a/src/com/itmill/toolkit/demo/TreeFilesystem.java b/src/com/itmill/toolkit/tests/TreeFilesystem.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/TreeFilesystem.java
rename to src/com/itmill/toolkit/tests/TreeFilesystem.java
index 25eeee64bc..e22634ef91 100644
--- a/src/com/itmill/toolkit/demo/TreeFilesystem.java
+++ b/src/com/itmill/toolkit/tests/TreeFilesystem.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import java.io.File;
 
diff --git a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java b/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/TreeFilesystemContainer.java
rename to src/com/itmill/toolkit/tests/TreeFilesystemContainer.java
index efff2932f6..8a0e364d5e 100644
--- a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java
+++ b/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 import java.io.File;
 
diff --git a/src/com/itmill/toolkit/demo/UpgradingSample.java b/src/com/itmill/toolkit/tests/UpgradingSample.java
similarity index 99%
rename from src/com/itmill/toolkit/demo/UpgradingSample.java
rename to src/com/itmill/toolkit/tests/UpgradingSample.java
index 2a8f1d3c61..50f6e177a9 100644
--- a/src/com/itmill/toolkit/demo/UpgradingSample.java
+++ b/src/com/itmill/toolkit/tests/UpgradingSample.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo;
+package com.itmill.toolkit.tests;
 
 //
 // Millstone imports were replaced