diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java
index ddaf5206..b2393fe9 100644
--- a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java
+++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java
@@ -3,7 +3,8 @@ package sample;
 import org.junit.Test;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class ApplicationFailFastTests {
 
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java
index faf92b16..634d1bfd 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.config.server.credentials;
 
-import static org.junit.Assert.*;
-
 import java.net.URISyntaxException;
 
 import org.eclipse.jgit.errors.UnsupportedCredentialItem;
@@ -30,6 +28,13 @@ import org.springframework.cloud.config.server.support.GitCredentialsProviderFac
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * It would be nice to do an integration test, however, this would require
  * using real AWS credentials. How can we test the credential generation
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java
index 4f315ee1..7ed5107e 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.config.server.credentials;
 
-import static org.junit.Assert.*;
-
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.junit.Before;
@@ -26,6 +24,12 @@ import org.springframework.cloud.config.server.support.AwsCodeCommitCredentialPr
 import org.springframework.cloud.config.server.support.GitCredentialsProviderFactory;
 import org.springframework.cloud.config.server.support.PassphraseCredentialsProvider;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author don laidlaw
  *