diff --git a/build/osx/golden_environment b/build/osx/golden_environment
index b8e5d83282b..d637d88b915 100644
--- a/build/osx/golden_environment
+++ b/build/osx/golden_environment
@@ -1 +1 @@
-2.2-j00010-4a29e0d-osx10.7-x86_64-release
+2.2-j00013-f9779fda-osx10.11-x86_64-release
diff --git a/build/osx/product_definition.plist b/build/osx/product_definition.plist
index 5629e0e216d..d737ec5e7c2 100644
--- a/build/osx/product_definition.plist
+++ b/build/osx/product_definition.plist
@@ -8,7 +8,7 @@
 	</array>
 	<key>os</key>
 	<array>
-		<string>10.8.0</string>
+		<string>10.11.0</string>
 	</array>
 </dict>
 </plist>
diff --git a/build/windows/golden_environment b/build/windows/golden_environment
index c64d054637a..58e8b0c4cb9 100644
--- a/build/windows/golden_environment
+++ b/build/windows/golden_environment
@@ -1 +1 @@
-2.2-j00014-PLATFORM-CONFIGURATION-static-036d353-minimal
+2.2-j00016-PLATFORM-CONFIGURATION-static-729dc20-minimal