--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -1,22 +1,20 @@
 %if 0
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
 :root {
   --tab-toolbar-navbar-overlap: 1px;
-/* Temporarily using the compact tab strip by default because of bug 1386964:
   --tab-min-height: 33px;
 }
 
 :root[uidensity=compact] {
-*/
   --tab-min-height: 29px;
 }
 
 :root[uidensity=touch] {
   --tab-min-height: 41px;
 }
 
 #tabbrowser-tabs,

--- a/testing/web-platform/meta/css/css-values-3/viewport-units-css2-001.html.ini
+++ b/testing/web-platform/meta/css/css-values-3/viewport-units-css2-001.html.ini
@@ -2,19 +2,21 @@
   type: testharness
   [vw length applied to border-top-width]
     expected:
       if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
   [vh length applied to border-top-width]
-    expected: FAIL
+    expected:
+      if os != "linux": FAIL
 
   [vmin length applied to border-top-width]
-    expected: FAIL
+    expected:
+      if os != "linux": FAIL
 
   [vmax length applied to border-top-width]
     expected:
       if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 

--- a/testing/web-platform/meta/scroll-anchoring/anchoring-with-bounds-clamping.html.ini
+++ b/testing/web-platform/meta/scroll-anchoring/anchoring-with-bounds-clamping.html.ini
@@ -1,5 +1,6 @@
 [anchoring-with-bounds-clamping.html]
   type: testharness
   [Anchoring combined with scroll bounds clamping in the document.]
-    expected: FAIL
+    expected:
+      if os != "mac": FAIL