diff --git a/openvidu-server/src/test/java/io/openvidu/server/config/DotenvTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/unit/DotenvTest.java
similarity index 96%
rename from openvidu-server/src/test/java/io/openvidu/server/config/DotenvTest.java
rename to openvidu-server/src/test/java/io/openvidu/server/test/unit/DotenvTest.java
index fc7a9f87..1a933abd 100644
--- a/openvidu-server/src/test/java/io/openvidu/server/config/DotenvTest.java
+++ b/openvidu-server/src/test/java/io/openvidu/server/test/unit/DotenvTest.java
@@ -1,4 +1,4 @@
-package io.openvidu.server.config;
+package io.openvidu.server.test.unit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -9,6 +9,7 @@ import java.nio.file.StandardCopyOption;
 
 import org.junit.jupiter.api.Test;
 
+import io.openvidu.server.config.Dotenv;
 import io.openvidu.server.config.Dotenv.DotenvFormatException;
 
 class DotenvTest {
@@ -40,7 +41,7 @@ class DotenvTest {
 
 		// When
 		dotenv.read(envFile);
-		
+
 		Files.delete(envFile);
 
 		dotenv.write();
diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile
index 55770940..14b904c2 100644
--- a/openvidu-test-e2e/jenkins/Jenkinsfile
+++ b/openvidu-test-e2e/jenkins/Jenkinsfile
@@ -52,8 +52,11 @@ node('container') {
         stage('OpenVidu TestApp build') {
           sh 'cd openvidu/openvidu-testapp && npm install --unsafe-perm && npm link openvidu-browser && npm link openvidu-node-client && export NG_CLI_ANALYTICS=ci && ./node_modules/@angular/cli/bin/ng build --prod'
         }
+        stage('OpenVidu Server unit tests') {
+          sh 'cd openvidu/openvidu-server && mvn --batch-mode -Dtest=io.openvidu.server.test.unit.*Test test'
+        }
         stage('OpenVidu Server integration tests') {
-          sh 'cd openvidu/openvidu-server && mvn --batch-mode -Dtest=*IntegrationTest test'
+          sh 'cd openvidu/openvidu-server && mvn --batch-mode -Dtest=io.openvidu.server.test.integration.*Test test'
         }
         stage('OpenVidu Server build') {
           sh 'cd openvidu/openvidu-server/src/dashboard && npm install --unsafe-perm && npm link openvidu-browser && export NG_CLI_ANALYTICS=ci && ./node_modules/@angular/cli/bin/ng build --prod --output-path ../main/resources/static'
@@ -75,7 +78,7 @@ node('container') {
           '''.stripIndent())
           sh 'until $(curl --insecure --output /dev/null --silent --head --fail https://OPENVIDUAPP:MY_SECRET@localhost:4443/); do echo "Waiting for openvidu-server..."; sleep 2; done'
         }
-        stage ('E2E tests') {
+        stage ('OpenVidu E2E tests') {
           try {
             sh(script: '''#!/bin/bash
               cd openvidu/openvidu-test-e2e && sudo mvn --batch-mode -DAPP_URL=https://172.17.0.1:4200/ -DOPENVIDU_URL=https://172.17.0.1:4443/ -DREMOTE_URL_CHROME=http://172.17.0.1:6666/wd/hub/ -DREMOTE_URL_FIREFOX=http://172.17.0.1:6667/wd/hub/ test