diff --git a/tests/globalid_converter.php b/tests/globalid_converter.php
index 9be4f5a..df9ecd3 100644
--- a/tests/globalid_converter.php
+++ b/tests/globalid_converter.php
@@ -1,39 +1,37 @@
 <?php
 
-require_once "../lib/kolab_sync_data.php";
-require_once "../lib/kolab_sync_data_email.php";
-
 class globalid_converter extends PHPUnit\Framework\TestCase
 {
-    function test_decode()
+    /**
+     * Test GlobalObjId encoding/decoding
+     */
+    function test_globalobjid()
     {
         // https://learn.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-asemail/e7424ddc-dd10-431e-a0b7-5c794863370e
         $input = 'BAAAAIIA4AB0xbcQGoLgCAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAHZDYWwtVWlkAQAAAHs4MTQxMkQzQy0yQTI0LTRFOUQtQjIwRS0xMUY3QkJFOTI3OTl9AA==';
         $output = kolab_sync_data_email::decodeGlobalObjId($input);
 
         $this->assertSame(51, $output['bytecount']);
         $this->assertSame('{81412D3C-2A24-4E9D-B20E-11F7BBE92799}', $output['uid']);
 
         $encoded = kolab_sync_data_email::encodeGlobalObjId($output);
         $this->assertSame($encoded, $input);
 
-
         $input = 'BAAAAIIA4AB0xbcQGoLgCAfUCRDgQMnBJoXEAQAAAAAAAAAAEAAAAAvw7UtuTulOnjnjhns3jvM=';
         $output = kolab_sync_data_email::decodeGlobalObjId($input);
 
         $this->assertSame(16, $output['bytecount']);
         $this->assertSame(2004, $output['year']);
         $this->assertSame(9, $output['month']);
         $this->assertSame(16, $output['day']);
         $this->assertSame(127373090979660000, $output['now']);
 
         // This is how the "now" value is interpreted
         // $winSecs       = (int)($output['now'] / 10000000); // convert microseconds to seconds
         // $unixTimestamp = ($winSecs - 11644473600); // subtract 1.1.1600 - 1.1.1970 difference in seconds
         // print(date(DateTime::RFC822, $unixTimestamp));
 
         $encoded = kolab_sync_data_email::encodeGlobalObjId($output);
         $this->assertSame($encoded, $input);
-        base64_decode($encoded);
     }
 }
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index fdd6461..a96591c 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,14 +1,15 @@
 <phpunit backupGlobals="false"
     bootstrap="bootstrap.php"
     colors="true">
     <testsuites>
         <testsuite name="All Tests">
             <file>body_converter.php</file>
             <file>data.php</file>
             <file>data_calendar.php</file>
             <file>data_tasks.php</file>
+            <file>globalid_converter.php</file>
             <file>message.php</file>
             <file>timezone_converter.php</file>
         </testsuite>
     </testsuites>
 </phpunit>