diff --git a/.gitignore b/.gitignore
index 55b624267..3c5ebe406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ selenium.php
 
 # for netbeans
 nbproject
+composer.lock
diff --git a/tests/unit/cms/classes/CmsObjectQueryTest.php b/tests/unit/cms/classes/CmsObjectQueryTest.php
index ae4d5d8dd..b6408aa45 100644
--- a/tests/unit/cms/classes/CmsObjectQueryTest.php
+++ b/tests/unit/cms/classes/CmsObjectQueryTest.php
@@ -44,6 +44,8 @@ class CmsObjectQueryTest extends TestCase
     {
         // Default theme: test
         $pages = Page::lists('baseFileName');
+        sort($pages);
+
         $this->assertEquals([
             "404",
             "a/a-page",
@@ -54,13 +56,13 @@ class CmsObjectQueryTest extends TestCase
             "blog-post",
             "code-namespaces",
             "component-custom-render",
+            "component-partial",
             "component-partial-nesting",
             "component-partial-override",
-            "component-partial",
             "cycle-test",
             "index",
-            "no-component-class",
             "no-component",
+            "no-component-class",
             "no-layout",
             "no-partial",
             "optional-full-php-tags",
@@ -75,6 +77,9 @@ class CmsObjectQueryTest extends TestCase
         ], $pages);
 
         $layouts = Layout::lists('baseFileName');
+
+        sort($layouts);
+
         $this->assertEquals([
             "a/a-layout",
             "ajax-test",