reverted:
--- b/core/drupalci.yml
+++ a/core/drupalci.yml
@@ -19,9 +19,30 @@
       # halt-on-fail can be set on the run_tests tasks in order to fail fast.
       # suppress-deprecations is false in order to be alerted to usages of
       # deprecated code.
+      run_tests.phpunit:
+        types: 'PHPUnit-Unit'
+        testgroups: '--all'
+        suppress-deprecations: false
+        halt-on-fail: false
       run_tests.kernel:
         types: 'PHPUnit-Kernel'
+        testgroups: '--all'
+        suppress-deprecations: false
+        halt-on-fail: false
+      run_tests.simpletest:
+         types: 'Simpletest'
+         testgroups: '--all'
+         suppress-deprecations: false
+         halt-on-fail: false
+      run_tests.functional:
+        types: 'PHPUnit-Functional'
+        testgroups: '--all'
+        suppress-deprecations: false
+        halt-on-fail: false
+      run_tests.javascript:
+        concurrency: 15
+        types: 'PHPUnit-FunctionalJavascript'
+        testgroups: '--all'
-        testgroups: 'migrationtests'
         suppress-deprecations: false
         halt-on-fail: false
       # Run nightwatch testing.
diff -u b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php
--- b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php
@@ -7,7 +7,7 @@
 /**
  * Test class for a master node migration for Drupal 6.
  *
- * @group migrationtests
+ * @group migrate_drupal_6
  */
 class MigrateNodeMasterTest extends MigrateNodeTestBase {
   use FileMigrationTestTrait;
diff -u b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php
--- b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php
@@ -9,7 +9,7 @@
 /**
  * Test class for a master node migration for Drupal 7.
  *
- * @group migrationtests
+ * @group migrate_drupal_7
  */
 class MigrateNodeMasterTest extends MigrateDrupal7TestBase {