diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java
deleted file mode 100644
index 8341df9fcb..0000000000
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.hibernate.criteria;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-public class HibernateCriteriaTestRunner {
-
-	public static void main(final String[] args) {
-		Result result = JUnitCore.runClasses(HibernateCriteriaTestSuite.class);
-		for (Failure failure : result.getFailures()) {
-			
-		}
-	}
-}
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
deleted file mode 100644
index ab27a6ba82..0000000000
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung.hibernate.criteria;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ HibernateCriteriaTest.class })
-
-public class HibernateCriteriaTestSuite {
-	
-}
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java
deleted file mode 100644
index 94ee8a3c79..0000000000
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.baeldung.hibernate.fetching;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.baeldung.hibernate.fetching.view.FetchingAppView;
-
-public class HibernateFetchingTest {
-
-	@Test
-	public void testLazyFetching() {
-		FetchingAppView fav = new FetchingAppView();
-		fav.createTestData();
-		assertFalse(fav.lazyLoaded());
-	}
-
-	@Test
-	public void testEagerFetching() {
-		FetchingAppView fav = new FetchingAppView();
-		assertTrue(fav.eagerLoaded());
-	}
-
-}
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java
deleted file mode 100644
index 82cf7acc40..0000000000
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.baeldung.hibernate.fetching;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-public class HibernateFetchingTestRunner {
-
-	public static void main(final String[] args) {
-
-		Result result = JUnitCore.runClasses(HibernateFetchingTestSuite.class);
-		for (Failure failure : result.getFailures()) {
-
-		}
-
-	}
-}
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java
deleted file mode 100644
index b3f0aea620..0000000000
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung.hibernate.fetching;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ HibernateFetchingTest.class })
-public class HibernateFetchingTestSuite {
-
-}
diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/spring-hibernate4/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml
similarity index 100%
rename from spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml
rename to spring-hibernate4/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml
diff --git a/spring-hibernate4/src/test/java/criteria.cfg.xml b/spring-hibernate4/src/test/resources/criteria.cfg.xml
similarity index 100%
rename from spring-hibernate4/src/test/java/criteria.cfg.xml
rename to spring-hibernate4/src/test/resources/criteria.cfg.xml