diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37010e539e..6e551d6c85 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,7 @@ jobs:
   test:
     parallelism: 5 # parallel containers to split the tests among
     machine:
-      image: circleci/classic:201707-01
+      image: ubuntu-2004:202201-02
     environment:
       _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
       _SERVICE_OCCURENCE: 5
@@ -140,7 +140,7 @@ jobs:
           destination: testartifacts
   build:
     machine:
-      image: circleci/classic:201707-01
+      image: ubuntu-2004:202201-02
     environment:
       _JAVA_OPTIONS: "-Xms2g -Xmx2g"
       _SERVICE_OCCURENCE: 5
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index 5bbd8db0ea..a7ab23db2e 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -131,7 +131,6 @@
 			<scope>test</scope>
 		</dependency>
 
-
 	</dependencies>
 
 </project>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8AutoConfigurationTests.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8AutoConfigurationTests.java
index 6ff3f17c6c..7b5a0c1cab 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8AutoConfigurationTests.java
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8AutoConfigurationTests.java
@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -32,11 +31,9 @@
 import org.springframework.cloud.kubernetes.fabric8.Fabric8InfoContributor;
 import org.springframework.cloud.kubernetes.fabric8.Fabric8PodUtils;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = { "spring.cloud.kubernetes.client.password=mypassword",
 				"spring.cloud.kubernetes.client.proxy-password=myproxypassword" })