diff --git a/spring-petclinic-tests/README.md b/spring-petclinic-test/README.md
similarity index 100%
rename from spring-petclinic-tests/README.md
rename to spring-petclinic-test/README.md
diff --git a/spring-petclinic-tests/pom.xml b/spring-petclinic-test/pom.xml
similarity index 99%
rename from spring-petclinic-tests/pom.xml
rename to spring-petclinic-test/pom.xml
index 2a64424b7..a177bbc59 100644
--- a/spring-petclinic-tests/pom.xml
+++ b/spring-petclinic-test/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.griddynamics.asf.webapp-demo</groupId>
-    <artifactId>spring-peclinic-tests</artifactId>
+    <artifactId>spring-peclinic-test</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <properties>
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/PetClinicStoreHost.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/PetClinicStoreHost.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/PetClinicStoreHost.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/PetClinicStoreHost.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/CustomPages.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/pages/CustomPages.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/CustomPages.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/pages/CustomPages.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java b/spring-petclinic-test/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java b/spring-petclinic-test/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java
diff --git a/spring-petclinic-tests/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java b/spring-petclinic-test/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java
similarity index 100%
rename from spring-petclinic-tests/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java
rename to spring-petclinic-test/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java
diff --git a/spring-petclinic-tests/src/main/resources/browser.properties b/spring-petclinic-test/src/main/resources/browser.properties
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/browser.properties
rename to spring-petclinic-test/src/main/resources/browser.properties
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/context/pagesBeans.xml b/spring-petclinic-test/src/main/resources/com/griddynamics/context/pagesBeans.xml
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/context/pagesBeans.xml
rename to spring-petclinic-test/src/main/resources/com/griddynamics/context/pagesBeans.xml
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml b/spring-petclinic-test/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml
rename to spring-petclinic-test/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/context/webApplicationContext.xml b/spring-petclinic-test/src/main/resources/com/griddynamics/context/webApplicationContext.xml
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/context/webApplicationContext.xml
rename to spring-petclinic-test/src/main/resources/com/griddynamics/context/webApplicationContext.xml
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml b/spring-petclinic-test/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml
rename to spring-petclinic-test/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story b/spring-petclinic-test/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story
rename to spring-petclinic-test/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story b/spring-petclinic-test/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story
rename to spring-petclinic-test/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story b/spring-petclinic-test/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story
rename to spring-petclinic-test/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story
diff --git a/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story b/spring-petclinic-test/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story
rename to spring-petclinic-test/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story
diff --git a/spring-petclinic-tests/src/main/resources/jbehave.properties b/spring-petclinic-test/src/main/resources/jbehave.properties
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/jbehave.properties
rename to spring-petclinic-test/src/main/resources/jbehave.properties
diff --git a/spring-petclinic-tests/src/main/resources/log4j.properties b/spring-petclinic-test/src/main/resources/log4j.properties
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/log4j.properties
rename to spring-petclinic-test/src/main/resources/log4j.properties
diff --git a/spring-petclinic-tests/src/main/resources/pages.properties b/spring-petclinic-test/src/main/resources/pages.properties
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/pages.properties
rename to spring-petclinic-test/src/main/resources/pages.properties
diff --git a/spring-petclinic-tests/src/main/resources/store.properties b/spring-petclinic-test/src/main/resources/store.properties
similarity index 100%
rename from spring-petclinic-tests/src/main/resources/store.properties
rename to spring-petclinic-test/src/main/resources/store.properties