diff --git a/configure b/configure
index 9aa23e732ab..ef6da404623 100755
--- a/configure
+++ b/configure
@@ -477,12 +477,6 @@ fi
 step_msg "validating $CFG_SELF args"
 validate_opt
 
-# Temporarily support the old windows triples while the bots make the transition
-# XXX Remove me
-CFG_BUILD=`echo "${CFG_BUILD}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
-CFG_HOST=`echo "${CFG_HOST}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
-CFG_TARGET=`echo "${CFG_TARGET}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
-
 # Validate the release channel
 case "$CFG_RELEASE_CHANNEL" in
     (source | nightly | beta | stable)
diff --git a/mk/tests.mk b/mk/tests.mk
index d89a29b5497..d28b80a5978 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -194,9 +194,6 @@ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
 check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# NOTE: Remove after reprogramming windows bots
-check-fast: check-lite
-
 # Some less critical tests that are not prone to breakage.
 # Not run as part of the normal test suite, but tested by bors on checkin.
 check-secondary: check-lexer check-pretty