diff --git a/pom.xml b/pom.xml
index f930fc8..cd417de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
         <configuration>
           <source>11</source>
           <target>11</target>
diff --git a/src/test/java/com/gmgauthier/Alltests.java b/src/test/java/com/gmgauthier/Alltests.java
new file mode 100644
index 0000000..98dac3b
--- /dev/null
+++ b/src/test/java/com/gmgauthier/Alltests.java
@@ -0,0 +1,16 @@
+package com.gmgauthier;
+
+import com.gmgauthier.client.requests.CalculatorClientTests;
+import com.gmgauthier.server.requests.CalculatorControllerTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        CalculatorClientTests.class,
+        CalculatorControllerTest.class
+})
+@SpringBootTest
+public class Alltests {
+}
diff --git a/src/test/java/com/gmgauthier/client/requests/CalculatorClientTests.java b/src/test/java/com/gmgauthier/client/requests/CalculatorClientTests.java
index 5248dec..324019f 100644
--- a/src/test/java/com/gmgauthier/client/requests/CalculatorClientTests.java
+++ b/src/test/java/com/gmgauthier/client/requests/CalculatorClientTests.java
@@ -1,7 +1,12 @@
 package com.gmgauthier.client.requests;
 
+import com.hackerrank.test.utility.OrderedTestRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
 
+@SpringBootTest
+@RunWith(OrderedTestRunner.class)
 public class CalculatorClientTests {
 
     @Test