diff --git a/pom.xml b/pom.xml
index 6418a28144..cf9981ccba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,9 @@
         <!-- Target Java 16 -->
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
+        <!-- Run tests using java 21 -->
+        <maven.compiler.testSource>21</maven.compiler.testSource>
+        <maven.compiler.testTarget>21</maven.compiler.testTarget>
 
         <!-- Spigot properties -->
         <spigot.version>1.20.6</spigot.version>
@@ -115,7 +118,7 @@
                 <!-- Compiler plugin -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
 
                 <configuration>
                     <excludes>
@@ -130,7 +133,7 @@
                 <!-- Attach sources -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
 
                 <executions>
                     <execution>
@@ -146,7 +149,7 @@
                 <!-- Plugin for Unit Tests -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.1</version>
 
                 <configuration>
                     <junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
@@ -235,7 +238,7 @@
                 <!-- Javadocs -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>3.7.0</version>
 
                 <configuration>
                     <reportOutputDirectory>${project.basedir}</reportOutputDirectory>
@@ -329,6 +332,18 @@
         </resources>
     </build>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>5.10.3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
 
@@ -358,7 +373,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -377,7 +391,7 @@
         <dependency>
             <groupId>com.github.seeseemelk</groupId>
             <artifactId>MockBukkit-v1.20</artifactId>
-            <version>3.89.0</version>
+            <version>3.93.2</version>
             <scope>test</scope>
 
             <exclusions>
@@ -387,20 +401,13 @@
                     <groupId>org.jetbrains</groupId>
                     <artifactId>annotations</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.papermc.paper</groupId>
-                    <artifactId>paper-api</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <!-- Override MockBukkit's Paper to a pinned slightly older version -->
-        <!-- This is because MockBukkit currently fails after this PR: -->
-        <!-- https://github.com/PaperMC/Paper/pull/9629 -->
+        <!-- Override Spigot with Paper as a CommandMap ctor was remvoed in Paper but still present in Spigot -->
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-20240205.114523-90</version>
-            <scope>test</scope>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
         </dependency>
 
         <!-- Third party plugin integrations / soft dependencies -->