diff --git a/CHANGELOG b/CHANGELOG
index 7450c0785..d9f161f87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add support for PHPUnit 6 and 7 (#6870)
 - Plugin API: Make actionbefore, before<action>, actionafter and after<action> events working with plugin actions (#7106)
 - Managesieve: Replace "Filter disabled" with "Filter enabled" (#7028)
 - Managesieve: Fix so modifier type select wasn't hidden after hiding modifier select on header change
diff --git a/composer.json-dist b/composer.json-dist
index 7655b1e8f..7243f51ec 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -22,7 +22,7 @@
         "endroid/qr-code": "~1.6.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.21"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
     },
     "suggest": {
         "kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",
diff --git a/plugins/acl/tests/Acl.php b/plugins/acl/tests/Acl.php
index 548fff26a..ec943e9dd 100644
--- a/plugins/acl/tests/Acl.php
+++ b/plugins/acl/tests/Acl.php
@@ -1,6 +1,6 @@
 <?php
 
-class Acl_Plugin extends PHPUnit_Framework_TestCase
+class Acl_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
index 7679af804..6517f3d55 100644
--- a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
+++ b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
@@ -1,6 +1,6 @@
 <?php
 
-class AdditionalMessageHeaders_Plugin extends PHPUnit_Framework_TestCase
+class AdditionalMessageHeaders_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/archive/tests/Archive.php b/plugins/archive/tests/Archive.php
index 3cdaf1af1..a16e48350 100644
--- a/plugins/archive/tests/Archive.php
+++ b/plugins/archive/tests/Archive.php
@@ -1,6 +1,6 @@
 <?php
 
-class Archive_Plugin extends PHPUnit_Framework_TestCase
+class Archive_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/attachment_reminder/tests/AttachmentReminder.php b/plugins/attachment_reminder/tests/AttachmentReminder.php
index 5a28ab64d..0a9716825 100644
--- a/plugins/attachment_reminder/tests/AttachmentReminder.php
+++ b/plugins/attachment_reminder/tests/AttachmentReminder.php
@@ -1,6 +1,6 @@
 <?php
 
-class AttachmentReminder_Plugin extends PHPUnit_Framework_TestCase
+class AttachmentReminder_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/autologon/tests/Autologon.php b/plugins/autologon/tests/Autologon.php
index cd25e7558..69bee0c4e 100644
--- a/plugins/autologon/tests/Autologon.php
+++ b/plugins/autologon/tests/Autologon.php
@@ -1,6 +1,6 @@
 <?php
 
-class Autologon_Plugin extends PHPUnit_Framework_TestCase
+class Autologon_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/database_attachments/tests/DatabaseAttachments.php b/plugins/database_attachments/tests/DatabaseAttachments.php
index 99331d259..ef2b376d6 100644
--- a/plugins/database_attachments/tests/DatabaseAttachments.php
+++ b/plugins/database_attachments/tests/DatabaseAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class DatabaseAttachments_Plugin extends PHPUnit_Framework_TestCase
+class DatabaseAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/debug_logger/tests/DebugLogger.php b/plugins/debug_logger/tests/DebugLogger.php
index 4438baf78..592fdf154 100644
--- a/plugins/debug_logger/tests/DebugLogger.php
+++ b/plugins/debug_logger/tests/DebugLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-class DebugLogger_Plugin extends PHPUnit_Framework_TestCase
+class DebugLogger_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/emoticons/tests/Emoticons.php b/plugins/emoticons/tests/Emoticons.php
index 9bfa42c0a..8342847bb 100644
--- a/plugins/emoticons/tests/Emoticons.php
+++ b/plugins/emoticons/tests/Emoticons.php
@@ -1,6 +1,6 @@
 <?php
 
-class Emoticons_Plugin extends PHPUnit_Framework_TestCase
+class Emoticons_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/emoticons/tests/EmoticonsEngine.php b/plugins/emoticons/tests/EmoticonsEngine.php
index f343450e6..58ad0668c 100644
--- a/plugins/emoticons/tests/EmoticonsEngine.php
+++ b/plugins/emoticons/tests/EmoticonsEngine.php
@@ -1,6 +1,6 @@
 <?php
 
-class EmoticonsEngine extends PHPUnit_Framework_TestCase
+class EmoticonsEngine extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/enigma/tests/Enigma.php b/plugins/enigma/tests/Enigma.php
index ada3f8d5b..aa82b8b44 100644
--- a/plugins/enigma/tests/Enigma.php
+++ b/plugins/enigma/tests/Enigma.php
@@ -1,6 +1,6 @@
 <?php
 
-class Enigma_Plugin extends PHPUnit_Framework_TestCase
+class Enigma_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/example_addressbook/tests/ExampleAddressbook.php b/plugins/example_addressbook/tests/ExampleAddressbook.php
index dab035572..ff9eb8bb8 100644
--- a/plugins/example_addressbook/tests/ExampleAddressbook.php
+++ b/plugins/example_addressbook/tests/ExampleAddressbook.php
@@ -1,6 +1,6 @@
 <?php
 
-class ExampleAddressbook_Plugin extends PHPUnit_Framework_TestCase
+class ExampleAddressbook_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/filesystem_attachments/tests/FilesystemAttachments.php b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
index 42b7f0685..e736b30a4 100644
--- a/plugins/filesystem_attachments/tests/FilesystemAttachments.php
+++ b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class FilesystemAttachments_Plugin extends PHPUnit_Framework_TestCase
+class FilesystemAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/help/tests/Help.php b/plugins/help/tests/Help.php
index f95da7562..d71393efb 100644
--- a/plugins/help/tests/Help.php
+++ b/plugins/help/tests/Help.php
@@ -1,6 +1,6 @@
 <?php
 
-class Help_Plugin extends PHPUnit_Framework_TestCase
+class Help_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/hide_blockquote/tests/HideBlockquote.php b/plugins/hide_blockquote/tests/HideBlockquote.php
index f4f954463..65431659e 100644
--- a/plugins/hide_blockquote/tests/HideBlockquote.php
+++ b/plugins/hide_blockquote/tests/HideBlockquote.php
@@ -1,6 +1,6 @@
 <?php
 
-class HideBlockquote_Plugin extends PHPUnit_Framework_TestCase
+class HideBlockquote_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/http_authentication/tests/HttpAuthentication.php b/plugins/http_authentication/tests/HttpAuthentication.php
index 4e76b070d..90618f38f 100644
--- a/plugins/http_authentication/tests/HttpAuthentication.php
+++ b/plugins/http_authentication/tests/HttpAuthentication.php
@@ -1,6 +1,6 @@
 <?php
 
-class HttpAuthentication_Plugin extends PHPUnit_Framework_TestCase
+class HttpAuthentication_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/identicon/tests/Identicon.php b/plugins/identicon/tests/Identicon.php
index f99a13b90..f80f1c675 100644
--- a/plugins/identicon/tests/Identicon.php
+++ b/plugins/identicon/tests/Identicon.php
@@ -1,6 +1,6 @@
 <?php
 
-class Identicon_Plugin extends PHPUnit_Framework_TestCase
+class Identicon_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/identity_select/tests/IdentitySelect.php b/plugins/identity_select/tests/IdentitySelect.php
index 447319a17..0ed35f95b 100644
--- a/plugins/identity_select/tests/IdentitySelect.php
+++ b/plugins/identity_select/tests/IdentitySelect.php
@@ -1,6 +1,6 @@
 <?php
 
-class IdentitySelect_Plugin extends PHPUnit_Framework_TestCase
+class IdentitySelect_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/jqueryui/tests/Jqueryui.php b/plugins/jqueryui/tests/Jqueryui.php
index ab0dc6232..20b959d71 100644
--- a/plugins/jqueryui/tests/Jqueryui.php
+++ b/plugins/jqueryui/tests/Jqueryui.php
@@ -1,6 +1,6 @@
 <?php
 
-class Jqueryui_Plugin extends PHPUnit_Framework_TestCase
+class Jqueryui_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/krb_authentication/tests/KrbAuthentication.php b/plugins/krb_authentication/tests/KrbAuthentication.php
index e1e4d012e..b8cca6685 100644
--- a/plugins/krb_authentication/tests/KrbAuthentication.php
+++ b/plugins/krb_authentication/tests/KrbAuthentication.php
@@ -1,6 +1,6 @@
 <?php
 
-class KrbAuthentication_Plugin extends PHPUnit_Framework_TestCase
+class KrbAuthentication_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Managesieve.php b/plugins/managesieve/tests/Managesieve.php
index 2cce9473e..650fd656d 100644
--- a/plugins/managesieve/tests/Managesieve.php
+++ b/plugins/managesieve/tests/Managesieve.php
@@ -1,6 +1,6 @@
 <?php
 
-class Managesieve_Plugin extends PHPUnit_Framework_TestCase
+class Managesieve_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Parser.php b/plugins/managesieve/tests/Parser.php
index 33edce0f0..e8cd553ee 100644
--- a/plugins/managesieve/tests/Parser.php
+++ b/plugins/managesieve/tests/Parser.php
@@ -1,6 +1,6 @@
 <?php
 
-class Parser extends PHPUnit_Framework_TestCase
+class Parser extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Tokenizer.php b/plugins/managesieve/tests/Tokenizer.php
index f40901594..ad2186bcb 100644
--- a/plugins/managesieve/tests/Tokenizer.php
+++ b/plugins/managesieve/tests/Tokenizer.php
@@ -1,6 +1,6 @@
 <?php
 
-class Tokenizer extends PHPUnit_Framework_TestCase
+class Tokenizer extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Vacation.php b/plugins/managesieve/tests/Vacation.php
index 5ab169ffe..85fcd33c8 100644
--- a/plugins/managesieve/tests/Vacation.php
+++ b/plugins/managesieve/tests/Vacation.php
@@ -1,6 +1,6 @@
 <?php
 
-class Managesieve_Vacation extends PHPUnit_Framework_TestCase
+class Managesieve_Vacation extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/markasjunk/tests/Markasjunk.php b/plugins/markasjunk/tests/Markasjunk.php
index dbf337aee..5e84ce4f7 100644
--- a/plugins/markasjunk/tests/Markasjunk.php
+++ b/plugins/markasjunk/tests/Markasjunk.php
@@ -1,6 +1,6 @@
 <?php
 
-class Markasjunk_Plugin extends PHPUnit_Framework_TestCase
+class Markasjunk_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/new_user_dialog/tests/NewUserDialog.php b/plugins/new_user_dialog/tests/NewUserDialog.php
index fdb0c6511..e38a6b39c 100644
--- a/plugins/new_user_dialog/tests/NewUserDialog.php
+++ b/plugins/new_user_dialog/tests/NewUserDialog.php
@@ -1,6 +1,6 @@
 <?php
 
-class NewUserDialog_Plugin extends PHPUnit_Framework_TestCase
+class NewUserDialog_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/new_user_identity/tests/NewUserIdentity.php b/plugins/new_user_identity/tests/NewUserIdentity.php
index beda199e3..cc04b3dba 100644
--- a/plugins/new_user_identity/tests/NewUserIdentity.php
+++ b/plugins/new_user_identity/tests/NewUserIdentity.php
@@ -1,6 +1,6 @@
 <?php
 
-class NewUserIdentity_Plugin extends PHPUnit_Framework_TestCase
+class NewUserIdentity_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/newmail_notifier/tests/NewmailNotifier.php b/plugins/newmail_notifier/tests/NewmailNotifier.php
index 3ab6d4142..3c98d805e 100644
--- a/plugins/newmail_notifier/tests/NewmailNotifier.php
+++ b/plugins/newmail_notifier/tests/NewmailNotifier.php
@@ -1,6 +1,6 @@
 <?php
 
-class NewmailNotifier_Plugin extends PHPUnit_Framework_TestCase
+class NewmailNotifier_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/password/tests/Password.php b/plugins/password/tests/Password.php
index a5be3fe69..4e1cc237c 100644
--- a/plugins/password/tests/Password.php
+++ b/plugins/password/tests/Password.php
@@ -1,6 +1,6 @@
 <?php
 
-class Password_Plugin extends PHPUnit_Framework_TestCase
+class Password_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/redundant_attachments/tests/RedundantAttachments.php b/plugins/redundant_attachments/tests/RedundantAttachments.php
index b283f1036..1240b5c29 100644
--- a/plugins/redundant_attachments/tests/RedundantAttachments.php
+++ b/plugins/redundant_attachments/tests/RedundantAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class RedundantAttachments_Plugin extends PHPUnit_Framework_TestCase
+class RedundantAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php b/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
index 803f47f1d..d2a84a709 100644
--- a/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
+++ b/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
@@ -1,6 +1,6 @@
 <?php
 
-class ShowAdditionalHeaders_Plugin extends PHPUnit_Framework_TestCase
+class ShowAdditionalHeaders_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
index f28da512b..f7929af8e 100644
--- a/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
+++ b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
@@ -1,6 +1,6 @@
 <?php
 
-class SquirrelmailUsercopy_Plugin extends PHPUnit_Framework_TestCase
+class SquirrelmailUsercopy_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/subscriptions_option/tests/SubscriptionsOption.php b/plugins/subscriptions_option/tests/SubscriptionsOption.php
index c8ca50bbb..bbb573fda 100644
--- a/plugins/subscriptions_option/tests/SubscriptionsOption.php
+++ b/plugins/subscriptions_option/tests/SubscriptionsOption.php
@@ -1,6 +1,6 @@
 <?php
 
-class SubscriptionsOption_Plugin extends PHPUnit_Framework_TestCase
+class SubscriptionsOption_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/userinfo/tests/Userinfo.php b/plugins/userinfo/tests/Userinfo.php
index 36fa1a389..dc02bebfb 100644
--- a/plugins/userinfo/tests/Userinfo.php
+++ b/plugins/userinfo/tests/Userinfo.php
@@ -1,6 +1,6 @@
 <?php
 
-class Userinfo_Plugin extends PHPUnit_Framework_TestCase
+class Userinfo_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/vcard_attachments/tests/VcardAttachments.php b/plugins/vcard_attachments/tests/VcardAttachments.php
index 0e42f4897..7dde2f224 100644
--- a/plugins/vcard_attachments/tests/VcardAttachments.php
+++ b/plugins/vcard_attachments/tests/VcardAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class VcardAttachments_Plugin extends PHPUnit_Framework_TestCase
+class VcardAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/virtuser_file/tests/VirtuserFile.php b/plugins/virtuser_file/tests/VirtuserFile.php
index 49eb094fc..f83c73661 100644
--- a/plugins/virtuser_file/tests/VirtuserFile.php
+++ b/plugins/virtuser_file/tests/VirtuserFile.php
@@ -1,6 +1,6 @@
 <?php
 
-class VirtuserFile_Plugin extends PHPUnit_Framework_TestCase
+class VirtuserFile_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/virtuser_query/tests/VirtuserQuery.php b/plugins/virtuser_query/tests/VirtuserQuery.php
index b41372b25..ced2c84b2 100644
--- a/plugins/virtuser_query/tests/VirtuserQuery.php
+++ b/plugins/virtuser_query/tests/VirtuserQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-class VirtuserQuery_Plugin extends PHPUnit_Framework_TestCase
+class VirtuserQuery_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/zipdownload/tests/Zipdownload.php b/plugins/zipdownload/tests/Zipdownload.php
index ec83d081a..180866591 100644
--- a/plugins/zipdownload/tests/Zipdownload.php
+++ b/plugins/zipdownload/tests/Zipdownload.php
@@ -1,6 +1,6 @@
 <?php
 
-class Zipdownload_Plugin extends PHPUnit_Framework_TestCase
+class Zipdownload_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/tests/Framework/BaseReplacer.php b/tests/Framework/BaseReplacer.php
index 2255e9af2..fd0c7c30c 100644
--- a/tests/Framework/BaseReplacer.php
+++ b/tests/Framework/BaseReplacer.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_BaseReplacer extends PHPUnit_Framework_TestCase
+class Framework_BaseReplacer extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Bootstrap.php b/tests/Framework/Bootstrap.php
index eeac418eb..9f6ca1242 100644
--- a/tests/Framework/Bootstrap.php
+++ b/tests/Framework/Bootstrap.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Bootstrap extends PHPUnit_Framework_TestCase
+class Framework_Bootstrap extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Browser.php b/tests/Framework/Browser.php
index 8cd7f8166..09465478d 100644
--- a/tests/Framework/Browser.php
+++ b/tests/Framework/Browser.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Browser extends PHPUnit_Framework_TestCase
+class Framework_Browser extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Cache.php b/tests/Framework/Cache.php
index dc026a634..330076ac9 100644
--- a/tests/Framework/Cache.php
+++ b/tests/Framework/Cache.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Cache extends PHPUnit_Framework_TestCase
+class Framework_Cache extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Charset.php b/tests/Framework/Charset.php
index f36b7b969..b970ff61f 100644
--- a/tests/Framework/Charset.php
+++ b/tests/Framework/Charset.php
@@ -7,7 +7,7 @@
  * @group iconv
  * @group mbstring
  */
-class Framework_Charset extends PHPUnit_Framework_TestCase
+class Framework_Charset extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Config.php b/tests/Framework/Config.php
index 6569fd5cf..5c521cf09 100644
--- a/tests/Framework/Config.php
+++ b/tests/Framework/Config.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Config extends PHPUnit_Framework_TestCase
+class Framework_Config extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Contacts.php b/tests/Framework/Contacts.php
index 0167ea366..08e60d1cc 100644
--- a/tests/Framework/Contacts.php
+++ b/tests/Framework/Contacts.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Contacts extends PHPUnit_Framework_TestCase
+class Framework_Contacts extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ContentFilter.php b/tests/Framework/ContentFilter.php
index 9bee9368b..a5fb25e2a 100644
--- a/tests/Framework/ContentFilter.php
+++ b/tests/Framework/ContentFilter.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ContentFilter extends PHPUnit_Framework_TestCase
+class Framework_ContentFilter extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Csv2vcard.php b/tests/Framework/Csv2vcard.php
index 34faf7d8d..5bd917f1b 100644
--- a/tests/Framework/Csv2vcard.php
+++ b/tests/Framework/Csv2vcard.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Csv2vcard extends PHPUnit_Framework_TestCase
+class Framework_Csv2vcard extends PHPUnit\Framework\TestCase
 {
 
     function test_import_generic()
diff --git a/tests/Framework/DB.php b/tests/Framework/DB.php
index 4350675e9..581f17374 100644
--- a/tests/Framework/DB.php
+++ b/tests/Framework/DB.php
@@ -6,7 +6,7 @@
  * @package Tests
  * @group database
  */
-class Framework_DB extends PHPUnit_Framework_TestCase
+class Framework_DB extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/DBMssql.php b/tests/Framework/DBMssql.php
index 47ab6037b..a1dced142 100644
--- a/tests/Framework/DBMssql.php
+++ b/tests/Framework/DBMssql.php
@@ -7,7 +7,7 @@
  * @group database
  * @group mssql
  */
-class Framework_DBMssql extends PHPUnit_Framework_TestCase
+class Framework_DBMssql extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/DBMysql.php b/tests/Framework/DBMysql.php
index 472657c27..1d5a3fc9a 100644
--- a/tests/Framework/DBMysql.php
+++ b/tests/Framework/DBMysql.php
@@ -7,7 +7,7 @@
  * @group database
  * @group mysql
  */
-class Framework_DBMysql extends PHPUnit_Framework_TestCase
+class Framework_DBMysql extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/DBOracle.php b/tests/Framework/DBOracle.php
index 27e138d1f..8fff546e0 100644
--- a/tests/Framework/DBOracle.php
+++ b/tests/Framework/DBOracle.php
@@ -7,7 +7,7 @@
  * @group database
  * @group oracle
  */
-class Framework_DBOracle extends PHPUnit_Framework_TestCase
+class Framework_DBOracle extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/DBPgsql.php b/tests/Framework/DBPgsql.php
index a7cb005d1..b3054f928 100644
--- a/tests/Framework/DBPgsql.php
+++ b/tests/Framework/DBPgsql.php
@@ -7,7 +7,7 @@
  * @group database
  * @group postgres
  */
-class Framework_DBPgsql extends PHPUnit_Framework_TestCase
+class Framework_DBPgsql extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/DBSqlite.php b/tests/Framework/DBSqlite.php
index 00de37e9a..7f33cec09 100644
--- a/tests/Framework/DBSqlite.php
+++ b/tests/Framework/DBSqlite.php
@@ -7,7 +7,7 @@
  * @group database
  * @group sqlite
  */
-class Framework_DBSqlite extends PHPUnit_Framework_TestCase
+class Framework_DBSqlite extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/DBSqlsrv.php b/tests/Framework/DBSqlsrv.php
index 9114cc5cc..345d38827 100644
--- a/tests/Framework/DBSqlsrv.php
+++ b/tests/Framework/DBSqlsrv.php
@@ -7,7 +7,7 @@
  * @group database
  * @group sqlrsv
  */
-class Framework_DBSqlsrv extends PHPUnit_Framework_TestCase
+class Framework_DBSqlsrv extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Enriched.php b/tests/Framework/Enriched.php
index 26bbc3b4e..de33c512d 100644
--- a/tests/Framework/Enriched.php
+++ b/tests/Framework/Enriched.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Enriched extends PHPUnit_Framework_TestCase
+class Framework_Enriched extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php
index 8507477c2..01e2a4915 100644
--- a/tests/Framework/Html.php
+++ b/tests/Framework/Html.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Html extends PHPUnit_Framework_TestCase
+class Framework_Html extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Html2text.php b/tests/Framework/Html2text.php
index 202812c38..bfbac7a0c 100644
--- a/tests/Framework/Html2text.php
+++ b/tests/Framework/Html2text.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class rc_html2text extends PHPUnit_Framework_TestCase
+class rc_html2text extends PHPUnit\Framework\TestCase
 {
 
     function data_html2text()
diff --git a/tests/Framework/Image.php b/tests/Framework/Image.php
index 31e852042..d45bbeebf 100644
--- a/tests/Framework/Image.php
+++ b/tests/Framework/Image.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Image extends PHPUnit_Framework_TestCase
+class Framework_Image extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Imap.php b/tests/Framework/Imap.php
index 3f52e07be..bebee465e 100644
--- a/tests/Framework/Imap.php
+++ b/tests/Framework/Imap.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Imap extends PHPUnit_Framework_TestCase
+class Framework_Imap extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ImapCache.php b/tests/Framework/ImapCache.php
index 6c7f98807..074ebd281 100644
--- a/tests/Framework/ImapCache.php
+++ b/tests/Framework/ImapCache.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapCache extends PHPUnit_Framework_TestCase
+class Framework_ImapCache extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ImapGeneric.php b/tests/Framework/ImapGeneric.php
index af73158e5..b76589cac 100644
--- a/tests/Framework/ImapGeneric.php
+++ b/tests/Framework/ImapGeneric.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapGeneric extends PHPUnit_Framework_TestCase
+class Framework_ImapGeneric extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ImapSearch.php b/tests/Framework/ImapSearch.php
index f91139c00..80882b001 100644
--- a/tests/Framework/ImapSearch.php
+++ b/tests/Framework/ImapSearch.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapSearch extends PHPUnit_Framework_TestCase
+class Framework_ImapSearch extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Ldap.php b/tests/Framework/Ldap.php
index 8306907e4..fd266f656 100644
--- a/tests/Framework/Ldap.php
+++ b/tests/Framework/Ldap.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Ldap extends PHPUnit_Framework_TestCase
+class Framework_Ldap extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/LdapGeneric.php b/tests/Framework/LdapGeneric.php
index dd4db4193..efeefb9cc 100644
--- a/tests/Framework/LdapGeneric.php
+++ b/tests/Framework/LdapGeneric.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_LdapGeneric extends PHPUnit_Framework_TestCase
+class Framework_LdapGeneric extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/MessageHeader.php b/tests/Framework/MessageHeader.php
index e5bc1752f..8ba0ab2ad 100644
--- a/tests/Framework/MessageHeader.php
+++ b/tests/Framework/MessageHeader.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_MessageHeader extends PHPUnit_Framework_TestCase
+class Framework_MessageHeader extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/MessagePart.php b/tests/Framework/MessagePart.php
index deb426024..dc3cc7597 100644
--- a/tests/Framework/MessagePart.php
+++ b/tests/Framework/MessagePart.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_MessagePart extends PHPUnit_Framework_TestCase
+class Framework_MessagePart extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Mime.php b/tests/Framework/Mime.php
index bbab0e64b..6768531fe 100644
--- a/tests/Framework/Mime.php
+++ b/tests/Framework/Mime.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Mime extends PHPUnit_Framework_TestCase
+class Framework_Mime extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Rcube.php b/tests/Framework/Rcube.php
index 637558dc9..3bec0be7b 100644
--- a/tests/Framework/Rcube.php
+++ b/tests/Framework/Rcube.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Rcube extends PHPUnit_Framework_TestCase
+class Framework_Rcube extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultIndex.php b/tests/Framework/ResultIndex.php
index da1cc628f..fada6075e 100644
--- a/tests/Framework/ResultIndex.php
+++ b/tests/Framework/ResultIndex.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultIndex extends PHPUnit_Framework_TestCase
+class Framework_ResultIndex extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultMultifolder.php b/tests/Framework/ResultMultifolder.php
index 83a2b1d96..b7045d590 100644
--- a/tests/Framework/ResultMultifolder.php
+++ b/tests/Framework/ResultMultifolder.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultMultifolder extends PHPUnit_Framework_TestCase
+class Framework_ResultMultifolder extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultSet.php b/tests/Framework/ResultSet.php
index 2d04e53c0..886c01774 100644
--- a/tests/Framework/ResultSet.php
+++ b/tests/Framework/ResultSet.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultSet extends PHPUnit_Framework_TestCase
+class Framework_ResultSet extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultThread.php b/tests/Framework/ResultThread.php
index 55fca4c6a..5b6c7bafd 100644
--- a/tests/Framework/ResultThread.php
+++ b/tests/Framework/ResultThread.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultThread extends PHPUnit_Framework_TestCase
+class Framework_ResultThread extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Smtp.php b/tests/Framework/Smtp.php
index 4bd78d097..d38f987b5 100644
--- a/tests/Framework/Smtp.php
+++ b/tests/Framework/Smtp.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Smtp extends PHPUnit_Framework_TestCase
+class Framework_Smtp extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Spellchecker.php b/tests/Framework/Spellchecker.php
index 9c3e92ffd..b1963bb59 100644
--- a/tests/Framework/Spellchecker.php
+++ b/tests/Framework/Spellchecker.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Spellchecker extends PHPUnit_Framework_TestCase
+class Framework_Spellchecker extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerAtd.php b/tests/Framework/SpellcheckerAtd.php
index d3152eaf3..eb8f12338 100644
--- a/tests/Framework/SpellcheckerAtd.php
+++ b/tests/Framework/SpellcheckerAtd.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerAtd extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerAtd extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerEnchant.php b/tests/Framework/SpellcheckerEnchant.php
index aad69d9db..39fad30ba 100644
--- a/tests/Framework/SpellcheckerEnchant.php
+++ b/tests/Framework/SpellcheckerEnchant.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerEnchant extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerEnchant extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerGoogie.php b/tests/Framework/SpellcheckerGoogie.php
index f1713eb11..8c1f1734c 100644
--- a/tests/Framework/SpellcheckerGoogie.php
+++ b/tests/Framework/SpellcheckerGoogie.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerGoogie extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerGoogie extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerPspell.php b/tests/Framework/SpellcheckerPspell.php
index 5888a8c0a..12a0edf55 100644
--- a/tests/Framework/SpellcheckerPspell.php
+++ b/tests/Framework/SpellcheckerPspell.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerPspell extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerPspell extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php
index 543601d35..6adaee4ce 100644
--- a/tests/Framework/StringReplacer.php
+++ b/tests/Framework/StringReplacer.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_StringReplacer extends PHPUnit_Framework_TestCase
+class Framework_StringReplacer extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Text2Html.php b/tests/Framework/Text2Html.php
index c85e44a4c..52d448090 100644
--- a/tests/Framework/Text2Html.php
+++ b/tests/Framework/Text2Html.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Text2Html extends PHPUnit_Framework_TestCase
+class Framework_Text2Html extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/User.php b/tests/Framework/User.php
index 3b1983c58..9065209ef 100644
--- a/tests/Framework/User.php
+++ b/tests/Framework/User.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_User extends PHPUnit_Framework_TestCase
+class Framework_User extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
index 3df90ffd0..770d87014 100644
--- a/tests/Framework/Utils.php
+++ b/tests/Framework/Utils.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Utils extends PHPUnit_Framework_TestCase
+class Framework_Utils extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/VCard.php b/tests/Framework/VCard.php
index 2827f9f01..1347c18bd 100644
--- a/tests/Framework/VCard.php
+++ b/tests/Framework/VCard.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_VCard extends PHPUnit_Framework_TestCase
+class Framework_VCard extends PHPUnit\Framework\TestCase
 {
 
     function _srcpath($fn)
diff --git a/tests/Framework/Washtml.php b/tests/Framework/Washtml.php
index 45042b968..84c9af646 100644
--- a/tests/Framework/Washtml.php
+++ b/tests/Framework/Washtml.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Washtml extends PHPUnit_Framework_TestCase
+class Framework_Washtml extends PHPUnit\Framework\TestCase
 {
     /**
      * A helper method to remove comments added by rcube_washtml
diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index a231644ff..678882413 100644
--- a/tests/MailFunc.php
+++ b/tests/MailFunc.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class MailFunc extends PHPUnit_Framework_TestCase
+class MailFunc extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/tests/Rcmail/OutputHtml.php b/tests/Rcmail/OutputHtml.php
index 0aa24c9b4..54ca576cd 100644
--- a/tests/Rcmail/OutputHtml.php
+++ b/tests/Rcmail/OutputHtml.php
@@ -4,7 +4,7 @@
  *
  * @package Tests
  */
-class Rcmail_OutputHtml extends PHPUnit_Framework_TestCase
+class Rcmail_OutputHtml extends PHPUnit\Framework\TestCase
 {
     /**
      * Test get_template_logo()
diff --git a/tests/Rcmail/Rcmail.php b/tests/Rcmail/Rcmail.php
index e6ed769e9..7a94d347a 100644
--- a/tests/Rcmail/Rcmail.php
+++ b/tests/Rcmail/Rcmail.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Rcmail_Rcmail extends PHPUnit_Framework_TestCase
+class Rcmail_Rcmail extends PHPUnit\Framework\TestCase
 {
     function setUp()
     {