diff --git a/plugins/CoreConsole/Commands/SetupFixture.php b/plugins/CoreConsole/Commands/SetupFixture.php
index 6ba5da74e4c3690bebcfd72297244b68b7926fce..5bcd867862b968ddd2edad25342d93e223f11c09 100644
--- a/plugins/CoreConsole/Commands/SetupFixture.php
+++ b/plugins/CoreConsole/Commands/SetupFixture.php
@@ -165,7 +165,7 @@ class SetupFixture extends ConsoleCommand
             '/tests/PHPUnit/Fixtures/*.php',
             '/tests/PHPUnit/UI/Fixtures/*.php',
             '/plugins/*/tests/Fixtures/*.php',
-            '/plugins/*/Test/Fixtures/*.php'
+            '/plugins/*/Test/Fixtures/*.php',
         );
         foreach($fixturesToLoad as $fixturePath) {
             foreach (glob(PIWIK_INCLUDE_PATH . $fixturePath) as $file) {
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index 739987e475fd315baa3daaa445e5611453ed2cab..fb841fe964fc4d7f176f4b189a24198ebab8b3d3 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -36,6 +36,7 @@ class OmniFixture extends \Fixture
         $date = $this->month . '-01';
 
         $classes = get_declared_classes();
+        sort($classes);
         foreach ($classes as $className) {
             if (is_subclass_of($className, 'Fixture')
                 && !is_subclass_of($className, __CLASS__)