diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index e73b0a6af59..50f2422f298 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -298,10 +298,8 @@
                            </artifactItems>
                         </configuration>
                      </execution>
-                     <!-- TODO: Switch this to 2.37.0 as soon as we release it.
-                          It will be important to test the switch at the current and previous version. -->
                      <execution>
-                        <id>unpack-2.36.0</id>
+                        <id>unpack-2.37.0</id>
                         <phase>compile</phase>
                         <goals>
                            <goal>unpack</goal>
@@ -311,7 +309,7 @@
                               <artifactItem>
                                  <groupId>org.apache.activemq</groupId>
                                  <artifactId>apache-artemis</artifactId>
-                                 <version>2.36.0</version>
+                                 <version>2.37.0</version>
                                  <classifier>bin</classifier>
                                  <type>zip</type>
                                  <outputDirectory>${basedir}/target/old-releases</outputDirectory>
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
index cb5ff18e437..b97e9856e6e 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
@@ -54,8 +54,7 @@ public class RollingUpgradeTest extends RealServerTestBase {
 
    private static final String TWO_THIRTY = "./target/old-releases/apache-artemis-2.30.0";
 
-   // TODO: Upgrade this towards 2.37 as soon as we release it
-   private static final String TWO_THIRTY_SIX = "./target/old-releases/apache-artemis-2.36.0";
+   private static final String TWO_THIRTY_SEVEN = "./target/old-releases/apache-artemis-2.37.0";
 
    private static final String QUEUE_NAME = "RollQueue";
 
@@ -188,8 +187,8 @@ public void testRollUpgrade_2_30() throws Exception {
    }
 
    @Test
-   public void testRollUpgrade_2_36() throws Exception {
-      testRollUpgrade(new File(TWO_THIRTY_SIX), HelperBase.getHome(ARTEMIS_HOME_PROPERTY));
+   public void testRollUpgrade_2_37() throws Exception {
+      testRollUpgrade(new File(TWO_THIRTY_SEVEN), HelperBase.getHome(ARTEMIS_HOME_PROPERTY));
    }
 
    // Define a System Property TEST_ROLLED_DISTRIBUTION towards the Artemis Home of your choice and this will