diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java
index ff678ebc..1ed305ed 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java
@@ -77,7 +77,8 @@ public class CachedRandomPropertySource extends PropertySource<PropertySource> {
 		}
 		return randomValueCache.computeIfAbsent(type, (theType) -> {
 			if (logger.isDebugEnabled()) {
-				logger.debug("No random value found in cache for key and value, generating a new value");
+				logger.debug(String.format(
+						"No random value found in cache for key: %s and type: %s, generating a new value", key, type));
 			}
 			return getSource().getProperty("random." + type);
 		});
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java
index b153bb6f..ef57e923 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java
@@ -23,9 +23,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.boot.Banner.Mode;
 import org.springframework.boot.WebApplicationType;
@@ -59,7 +61,7 @@ public class RefreshEndpointTests {
 
 	private ConfigurableApplicationContext context;
 
-	@After
+	@AfterEach
 	public void close() {
 		if (this.context != null) {
 			this.context.close();
@@ -67,7 +69,7 @@ public class RefreshEndpointTests {
 	}
 
 	@Test
-	@Ignore // FIXME: legacy
+	@Disabled // FIXME: legacy
 	public void keysComputedWhenAdded() throws Exception {
 		this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF)
 				.properties("spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name:none").run();
@@ -81,7 +83,7 @@ public class RefreshEndpointTests {
 	}
 
 	@Test
-	@Ignore // FIXME: legacy
+	@Disabled // FIXME: legacy
 	public void keysComputedWhenOveridden() throws Exception {
 		this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF)
 				.properties("spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name:none").run();
@@ -95,7 +97,6 @@ public class RefreshEndpointTests {
 	}
 
 	@Test
-	@Ignore // FIXME: legacy
 	public void keysComputedWhenChangesInExternalProperties() throws Exception {
 		this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF)
 				.properties("spring.cloud.bootstrap.name:none", "spring.config.use-legacy-processing=true").run();
@@ -142,6 +143,7 @@ public class RefreshEndpointTests {
 	}
 
 	@Test
+	@DisabledForJreRange(min = JRE.JAVA_16) // FIXME:
 	public void shutdownHooksCleaned() {
 		try (ConfigurableApplicationContext context = new SpringApplicationBuilder(Empty.class)
 				.web(WebApplicationType.NONE).bannerMode(Mode.OFF).run()) {
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java
index cbe3687e..1ab40491 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java
@@ -18,59 +18,60 @@ package org.springframework.cloud.util.random;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.core.env.PropertySource;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.StringUtils;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
  * @author Ryan Baxter
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(OutputCaptureExtension.class)
 @DirtiesContext
 public class CachedRandomPropertySourceTests {
 
 	@Mock
 	private PropertySource randomValuePropertySource;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		when(randomValuePropertySource.getProperty(eq("random.long"))).thenReturn(1234L);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void getProperty() {
+	public void getProperty(CapturedOutput output) {
 		Map<String, Map<String, Object>> cache = new HashMap<>();
 		Map<String, Object> typeCache = new HashMap<>();
 		typeCache.put("long", 5678L);
-		Map<String, Object> spyedTypeCache = spy(typeCache);
-		cache.put("foo", spyedTypeCache);
-		Map<String, Map<String, Object>> spyedCache = spy(cache);
+		cache.put("foo", typeCache);
 
 		CachedRandomPropertySource cachedRandomPropertySource = new CachedRandomPropertySource(
-				randomValuePropertySource, spyedCache);
+				randomValuePropertySource, cache);
 		then(cachedRandomPropertySource.getProperty("foo.app.long")).isNull();
 		then(cachedRandomPropertySource.getProperty("cachedrandom.app")).isNull();
 
 		then(cachedRandomPropertySource.getProperty("cachedrandom.app.long")).isEqualTo(1234L);
 		then(cachedRandomPropertySource.getProperty("cachedrandom.foo.long")).isEqualTo(5678L);
-		verify(spyedCache, times(1)).computeIfAbsent(eq("app"), isA(Function.class));
-		verify(spyedTypeCache, times(1)).computeIfAbsent(eq("long"), isA(Function.class));
+		then(StringUtils.countOccurrencesOf(output.toString(), "No cached value found for key: app")).isEqualTo(1);
+		then(StringUtils.countOccurrencesOf(output.toString(),
+				"No random value found in cache for key: app and type: long, generating a new value")).isEqualTo(1);
+		then(StringUtils.countOccurrencesOf(output.toString(), "No cached value found for key: foo")).isEqualTo(0);
+		then(StringUtils.countOccurrencesOf(output.toString(),
+				"No random value found in cache for key: foot and type: long, generating a new value")).isEqualTo(0);
 	}
 
 }