diff --git a/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
index ba17ca7938..ff1742351b 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
@@ -2,11 +2,9 @@ package org.baeldung.spring.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-@ImportResource("classpath:configForProperties.xml")
 @ComponentScan("org.baeldung.core")
 public class CoreConfig extends WebMvcConfigurerAdapter {
 
diff --git a/spring-all/src/main/java/org/baeldung/spring/properties/PropertiesWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/spring/properties/PropertiesWithJavaConfig.java
new file mode 100644
index 0000000000..fc67b7430a
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/spring/properties/PropertiesWithJavaConfig.java
@@ -0,0 +1,17 @@
+package org.baeldung.spring.properties;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+@ComponentScan("org.baeldung.core")
+@PropertySource("classpath:foo.properties")
+public class PropertiesWithJavaConfig extends WebMvcConfigurerAdapter {
+
+    public PropertiesWithJavaConfig() {
+        super();
+    }
+
+}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/spring/properties/PropertiesWithXmlConfig.java b/spring-all/src/main/java/org/baeldung/spring/properties/PropertiesWithXmlConfig.java
new file mode 100644
index 0000000000..f5f5de77cb
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/spring/properties/PropertiesWithXmlConfig.java
@@ -0,0 +1,17 @@
+package org.baeldung.spring.properties;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+@ImportResource("classpath:configForProperties.xml")
+@ComponentScan("org.baeldung.core")
+public class PropertiesWithXmlConfig extends WebMvcConfigurerAdapter {
+
+    public PropertiesWithXmlConfig() {
+        super();
+    }
+
+}
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/core/PropertiesWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/core/PropertiesWithJavaIntegrationTest.java
new file mode 100644
index 0000000000..e3cfb493ed
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/core/PropertiesWithJavaIntegrationTest.java
@@ -0,0 +1,19 @@
+package org.baeldung.core;
+
+import org.baeldung.spring.properties.PropertiesWithJavaConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class PropertiesWithJavaIntegrationTest {
+
+    @Test
+    public final void givenContextIsInitialized_thenNoException() {
+        //
+    }
+
+}
diff --git a/spring-all/src/test/java/org/baeldung/core/PropertiesViaXmlIntegrationTest.java b/spring-all/src/test/java/org/baeldung/core/PropertiesWithXmlIntegrationTest.java
similarity index 66%
rename from spring-all/src/test/java/org/baeldung/core/PropertiesViaXmlIntegrationTest.java
rename to spring-all/src/test/java/org/baeldung/core/PropertiesWithXmlIntegrationTest.java
index 5bfede4217..44cacf58e3 100644
--- a/spring-all/src/test/java/org/baeldung/core/PropertiesViaXmlIntegrationTest.java
+++ b/spring-all/src/test/java/org/baeldung/core/PropertiesWithXmlIntegrationTest.java
@@ -1,6 +1,6 @@
 package org.baeldung.core;
 
-import org.baeldung.spring.config.CoreConfig;
+import org.baeldung.spring.properties.PropertiesWithXmlConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -8,8 +8,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { CoreConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class PropertiesViaXmlIntegrationTest {
+@ContextConfiguration(classes = { PropertiesWithXmlConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class PropertiesWithXmlIntegrationTest {
 
     @Test
     public final void givenContextIsInitialized_thenNoException() {