diff --git a/dom/media/test/mochitest_media_recorder.toml b/dom/media/test/mochitest_media_recorder.toml
index 017af2d9a999..3bebaab839c8 100644
--- a/dom/media/test/mochitest_media_recorder.toml
+++ b/dom/media/test/mochitest_media_recorder.toml
@@ -727,7 +727,7 @@ skip-if = ["os == 'android'"] # android(bug 1232305)
 
 ["test_mediarecorder_principals.html"]
 skip-if = [
-  "os == 'win' && os_version == '10.0'", # Bug 1453375
+  "os == 'win' && os_version == '10.2009'", # Bug 1453375
   "os == 'android'", # Bug 1694645
 ]
 
diff --git a/dom/payments/test/mochitest.toml b/dom/payments/test/mochitest.toml
index e6033dcf2b27..f24ab35db5db 100644
--- a/dom/payments/test/mochitest.toml
+++ b/dom/payments/test/mochitest.toml
@@ -51,7 +51,7 @@ skip-if = ["debug"] # Bug 1507251 - Leak
 skip-if = [
   "os == 'linux'",
   "os == 'mac'",
-  "os == 'win' && os_version == '10.0'", # Bug 1514425
+  "os == 'win' && os_version == '10.2009'", # Bug 1514425
 ]
 
 ["test_currency_amount_validation.html"]
diff --git a/layout/tools/reftest/manifest.sys.mjs b/layout/tools/reftest/manifest.sys.mjs
index 4be0afde57c1..a4a8ed126fb6 100644
--- a/layout/tools/reftest/manifest.sys.mjs
+++ b/layout/tools/reftest/manifest.sys.mjs
@@ -677,6 +677,9 @@ function BuildConditionSandbox(aURL) {
     sandbox.d2d &&
     sandbox.gpuProcess;
 
+  sandbox.mozinfo = Services.prefs.getStringPref("sandbox.mozinfo", null);
+  sandbox.os_version = sandbox.mozinfo.os_version;
+
   sandbox.layersGPUAccelerated = g.windowUtils.layerManagerType != "Basic";
   sandbox.d3d11 = g.windowUtils.layerManagerType == "Direct3D 11";
   sandbox.d3d9 = g.windowUtils.layerManagerType == "Direct3D 9";
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 91994526f062..e97a6de5d70e 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -462,6 +462,9 @@ class RefTest(object):
         # config specific flags
         prefs["sandbox.apple_silicon"] = mozinfo.info.get("apple_silicon", False)
 
+        prefs["sandbox.mozinfo"] = json.dumps(mozinfo.info)
+        prefs["sandbox.os_version"] = mozinfo.info.get("os_version", "")
+
         # Set tests to run or manifests to parse.
         if tests:
             testlist = os.path.join(profile.profile, "reftests.json")
diff --git a/testing/mozbase/mozinfo/mozinfo/mozinfo.py b/testing/mozbase/mozinfo/mozinfo/mozinfo.py
index bb04be54c83f..0114b17f6692 100755
--- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py
+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py
@@ -65,7 +65,13 @@ if system in ["Microsoft", "Windows"]:
     version = "%d.%d.%d" % (major, minor, build_number)
     if major == 10 and minor == 0 and build_number >= 22000:
         major = 11
-    os_version = "%d.%d" % (major, minor)
+
+    # 2009 == 22H2 software update.  These are the build numbers
+    # we use 2009 as the "build" which maps to what taskcluster tasks see
+    if build_number == 22621 or build_number == 19045:
+        build_number = 2009
+
+    os_version = "%d.%d" % (major, build_number)
 elif system.startswith(("MINGW", "MSYS_NT")):
     # windows/mingw python build (msys)
     info["os"] = "win"
@@ -107,7 +113,7 @@ elif system == "Darwin":
     (release, versioninfo, machine) = platform.mac_ver()
     version = "OS X %s" % release
     versionNums = release.split(".")[:2]
-    os_version = "%s.%s" % (versionNums[0], versionNums[1])
+    os_version = "%s.%s" % (versionNums[0], versionNums[1].ljust(2, "0"))
     info["os"] = "mac"
 elif sys.platform in ("solaris", "sunos5"):
     info["os"] = "unix"
@@ -277,8 +283,8 @@ def find_and_update_from_json(*dirs, **kwargs):
     except (BuildEnvironmentNotFoundException, MozconfigFindException):
         pass
 
-    for d in dirs:
-        d = _os.path.abspath(d)
+    for dir in dirs:
+        d = _os.path.abspath(dir)
         json_path = _os.path.join(d, "mozinfo.json")
         if _os.path.isfile(json_path):
             update(json_path)
diff --git a/toolkit/components/tooltiptext/tests/browser.toml b/toolkit/components/tooltiptext/tests/browser.toml
index d03716e6838b..42aca4a7a6ae 100644
--- a/toolkit/components/tooltiptext/tests/browser.toml
+++ b/toolkit/components/tooltiptext/tests/browser.toml
@@ -11,7 +11,6 @@ support-files = ["xul_tooltiptext.xhtml"]
 ["browser_bug581947.js"]
 
 ["browser_input_file_tooltips.js"]
-skip-if = ["os == 'win' && os_version == '10.0'"]  # Permafail on Win 10 (bug 1400368)
 
 ["browser_nac_tooltip.js"]
 
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser.toml b/toolkit/mozapps/extensions/test/xpinstall/browser.toml
index f6ca43982e2b..f2c73b0a1d47 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser.toml
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser.toml
@@ -96,7 +96,7 @@ https_first_disabled = true # Bug 1737265
 ["browser_doorhanger_installs.js"]
 https_first_disabled = true # Bug 1737265
 skip-if = [
-  "os == 'win' && os_version == '10.0' && bits == 64", #Bug 1615449
+  "os == 'win' && os_version == '10.2009' && bits == 64", #Bug 1615449
 ]
 
 ["browser_empty.js"]