diff --git a/ci/start-ci.sh b/ci/start-ci.sh
index ec8fab1..83f4492 100644
--- a/ci/start-ci.sh
+++ b/ci/start-ci.sh
@@ -85,7 +85,7 @@ echo "--- Starting an instance of OrientDB ---"
 if [ -z "${HANG_UP}" ]; then
     sh -c ${ODB_LAUNCHER_SYML} </dev/null &>/dev/null &
     # Wait a bit for OrientDB to finish the initialization phase.
-    sleep 5
+    sleep 10
     printf "\n=== The CI environment has been initialized ===\n"
 else
     sh -c ${ODB_LAUNCHER_SYML}
diff --git a/tests/PhpOrient/ConnectionTokenTest.php b/tests/PhpOrient/ConnectionTokenTest.php
index b82b378..5b09bcd 100644
--- a/tests/PhpOrient/ConnectionTokenTest.php
+++ b/tests/PhpOrient/ConnectionTokenTest.php
@@ -35,6 +35,18 @@ public function setUp(){
             $this->markTestSkipped( "Token not well supported in OrientDB >= 2.2.0 and < 2.4.0" );
         }
 
+        if(
+            (
+                $client->getTransport()->getOrientVersion()->getMinorVersion() >= 0 &&
+                $client->getTransport()->getOrientVersion()->getBuildNumber() >= 18
+            ) && (
+                $client->getTransport()->getOrientVersion()->getMinorVersion() >= 1 &&
+                $client->getTransport()->getOrientVersion()->getBuildNumber() <= 25
+            )
+        ){
+            $this->markTestSkipped( "Token not well supported in OrientDB >= 2.0.18 and < 2.1.25" );
+        }
+
     }
 
     public function tearDown(){
diff --git a/tests/PhpOrient/RecordCommandsTest.php b/tests/PhpOrient/RecordCommandsTest.php
index dc4c0cf..407e945 100644
--- a/tests/PhpOrient/RecordCommandsTest.php
+++ b/tests/PhpOrient/RecordCommandsTest.php
@@ -428,7 +428,7 @@ public function testRecordData(){
         $client = new PhpOrient( 'localhost', 2424 );
         $client->connect( 'root', 'root' );
 
-        $this->skipTestByOrientDBVersion( [ '2.0.13', '1.7.10' ] );
+        $this->skipTestByOrientDBVersion( [ '2.2.3', '2.2.4', '2.0.18', '2.0.13', '1.7.10' ] );
 
         try {
             $client->dbDrop( $db_name, Constants::STORAGE_TYPE_MEMORY );