diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java
index 7b6ee56d..b6327062 100644
--- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java
+++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java
@@ -175,8 +175,20 @@ public class SpringBootDependencyTests {
 
 	@Test
 	public void should_match_against_current_manifest() {
-		verifyCurrentVersionFromManifest("3.0");
-		verifyCurrentVersionFromManifest("3.0.x");
+		try {
+			verifyCurrentVersionFromManifest("3.0");
+			verifyCurrentVersionFromManifest("3.0.x");
+		}
+		catch (AssertionError e) {
+			if (e.getMessage() != null && e.getMessage().contains("3.1.")) {
+				// we're likely running a boot 3.1 compatibility test, try 3.1
+				verifyCurrentVersionFromManifest("3.1");
+				verifyCurrentVersionFromManifest("3.1.x");
+			}
+			else {
+				throw e;
+			}
+		}
 	}
 
 	private void verifyCurrentVersionFromManifest(String version) {