diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 771cef6e4d0d6..ac7d8429e2ba3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,16 +44,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-xl
-            env: {}
-          - name: x86_64-gnu-llvm-13
-            os: ubuntu-20.04-xl
-            env: {}
-          - name: x86_64-gnu-tools
+          - name: x86_64-msvc-2
             env:
-              CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
-            os: ubuntu-20.04-xl
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
+              SCRIPT: make ci-subset-2
+            os: windows-latest-xl
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 9f40177990080..9eea2f89cbb1a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -286,16 +286,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-xl
-
-          - name: x86_64-gnu-llvm-13
-            <<: *job-linux-xl
-
-          - name: x86_64-gnu-tools
+          - name: x86_64-msvc-2
             env:
-              CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
-            <<: *job-linux-xl
+              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
+              SCRIPT: make ci-subset-2
+            <<: *job-windows-xl
 
   auto:
     permissions:
diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile
index 642a480815b7b..0ed47708dd671 100644
--- a/src/test/run-make-fulldeps/reproducible-build/Makefile
+++ b/src/test/run-make-fulldeps/reproducible-build/Makefile
@@ -1,5 +1,9 @@
 include ../tools.mk
 
+ifdef IS_WINDOWS
+        REPRO_LINKER_FLAGS=-Clink-arg=/experimental:deterministic 
+endif
+
 # ignore-musl
 # Objects are reproducible but their path is not.
 
@@ -12,14 +16,11 @@ all:  \
 	different_source_dirs_rlib \
 	remap_cwd_rlib \
 	remap_cwd_to_empty \
+	different_source_dirs_bin \
 	extern_flags
 
-# TODO: Builds of `bin` crate types are not deterministic with debuginfo=2 on
-# Windows.
-# See: https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533
-# Issue: https://github.com/rust-lang/rust/issues/88982
+# This test appears to not be working on either Linux or Windows
 #
-#	different_source_dirs_bin \
 #	remap_cwd_bin \
 
 smoke:
@@ -67,11 +68,12 @@ different_source_dirs_bin:
 	$(RUSTC) reproducible-build-aux.rs
 	mkdir $(TMPDIR)/test
 	cp reproducible-build.rs $(TMPDIR)/test
-	$(RUSTC) reproducible-build.rs --crate-type bin --remap-path-prefix=$$PWD=/b
+	$(RUSTC) reproducible-build.rs --crate-type bin --remap-path-prefix=$$PWD=/b $(REPRO_LINKER_FLAGS)
 	cp $(TMPDIR)/reproducible-build $(TMPDIR)/foo
 	(cd $(TMPDIR)/test && $(RUSTC) reproducible-build.rs \
 		--remap-path-prefix=$(TMPDIR)/test=/b \
-		--crate-type bin)
+		--crate-type bin \
+		$(REPRO_LINKER_FLAGS))
 	cmp "$(TMPDIR)/reproducible-build" "$(TMPDIR)/foo" || exit 1
 
 different_source_dirs_rlib: