diff --git a/tests/PHPUnit/Core/AccessTest.php b/tests/PHPUnit/Integration/Core/AccessTest.php
similarity index 100%
rename from tests/PHPUnit/Core/AccessTest.php
rename to tests/PHPUnit/Integration/Core/AccessTest.php
diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
similarity index 100%
rename from tests/PHPUnit/Core/ArchiveProcessingTest.php
rename to tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
diff --git a/tests/PHPUnit/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
similarity index 100%
rename from tests/PHPUnit/Core/LogTest.php
rename to tests/PHPUnit/Integration/Core/LogTest.php
diff --git a/tests/PHPUnit/Core/OptionTest.php b/tests/PHPUnit/Integration/Core/OptionTest.php
similarity index 100%
rename from tests/PHPUnit/Core/OptionTest.php
rename to tests/PHPUnit/Integration/Core/OptionTest.php
diff --git a/tests/PHPUnit/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
similarity index 100%
rename from tests/PHPUnit/Core/PiwikTest.php
rename to tests/PHPUnit/Integration/Core/PiwikTest.php
diff --git a/tests/PHPUnit/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Plugin/SettingsTest.php
rename to tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
diff --git a/tests/PHPUnit/Core/SqlTest.php b/tests/PHPUnit/Integration/Core/SqlTest.php
similarity index 100%
rename from tests/PHPUnit/Core/SqlTest.php
rename to tests/PHPUnit/Integration/Core/SqlTest.php
diff --git a/tests/PHPUnit/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Tracker/ActionTest.php
rename to tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Tracker/VisitTest.php
rename to tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
diff --git a/tests/PHPUnit/Core/UpdaterTest.php b/tests/PHPUnit/Integration/Core/UpdaterTest.php
similarity index 100%
rename from tests/PHPUnit/Core/UpdaterTest.php
rename to tests/PHPUnit/Integration/Core/UpdaterTest.php
diff --git a/tests/PHPUnit/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
similarity index 100%
rename from tests/PHPUnit/Core/WidgetsListTest.php
rename to tests/PHPUnit/Integration/Core/WidgetsListTest.php
diff --git a/tests/PHPUnit/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/LoginTest.php
rename to tests/PHPUnit/Integration/Plugins/LoginTest.php
diff --git a/tests/PHPUnit/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/MobileMessagingTest.php
rename to tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
diff --git a/tests/PHPUnit/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/MultiSitesTest.php
rename to tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
diff --git a/tests/PHPUnit/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/ScheduledReportsTest.php
rename to tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
diff --git a/tests/PHPUnit/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/SegmentEditorTest.php
rename to tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
diff --git a/tests/PHPUnit/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/SitesManagerTest.php
rename to tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
diff --git a/tests/PHPUnit/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
similarity index 100%
rename from tests/PHPUnit/Plugins/UsersManagerTest.php
rename to tests/PHPUnit/Integration/Plugins/UsersManagerTest.php