diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
index 1fa3f644543..cac01672253 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -41,6 +41,7 @@ import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.boot.env.EnumerableCompositePropertySource;
 import org.springframework.boot.env.EnvironmentPostProcessor;
 import org.springframework.boot.env.PropertySourcesLoader;
+import org.springframework.boot.env.RandomValuePropertySource;
 import org.springframework.boot.logging.DeferredLog;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java b/spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java
rename to spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java
index e3bfb29ff2f..1d608f7ace3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.config;
+package org.springframework.boot.env;
 
 import java.util.Random;
 import java.util.UUID;
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
index 785ae93acfd..8a4e36e7ac6 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
@@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
 import org.junit.Test;
 
 import org.springframework.beans.NotWritablePropertyException;
-import org.springframework.boot.context.config.RandomValuePropertySource;
+import org.springframework.boot.env.RandomValuePropertySource;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/RandomValuePropertySourceTests.java b/spring-boot/src/test/java/org/springframework/boot/env/RandomValuePropertySourceTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/context/config/RandomValuePropertySourceTests.java
rename to spring-boot/src/test/java/org/springframework/boot/env/RandomValuePropertySourceTests.java
index bc8ed600d3b..f25ea683625 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/config/RandomValuePropertySourceTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/env/RandomValuePropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.config;
+package org.springframework.boot.env;
 
 import java.util.Random;
 import java.util.UUID;