diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
index 0615cacbbde..488225ab2de 100644
--- a/conda.recipe/build.sh
+++ b/conda.recipe/build.sh
@@ -2,10 +2,10 @@
 
 echo $PKG_VERSION > conda/.version
 $PYTHON setup.py install --single-version-externally-managed --record record.txt
-if [[ $(uname -o) != Msys ]]; then
+if [[ ! $(uname) =~ M.* ]]; then
   rm -rf "$SP_DIR/conda/shell/*.exe"
 fi
 $PYTHON -m conda init --install
-if [[ $(uname -o) == Msys ]]; then
+if [[ ! $(uname) =~ M.* ]]; then
   sed -i "s|CONDA_EXE=.*|CONDA_EXE=\'${PREFIXW//\\/\\\\}\\\\Scripts\\\\conda.exe\'|g" $PREFIX/etc/profile.d/conda.sh
 fi
diff --git a/conda.recipe/run_test.sh b/conda.recipe/run_test.sh
index 6e7f3e905dd..b32b4d34e39 100644
--- a/conda.recipe/run_test.sh
+++ b/conda.recipe/run_test.sh
@@ -12,10 +12,11 @@ export TEST_PLATFORM=$(python -c "import sys; print('win' if sys.platform.starts
 export PYTHONHASHSEED=$(python -c "import random as r; print(r.randint(0,4294967296))") && echo "PYTHONHASHSEED=$PYTHONHASHSEED"
 env | sort
 conda info
-conda create -y -p ./built-conda-test-env python=3.5
+conda create -y -p ./built-conda-test-env python=3.9
 conda activate ./built-conda-test-env
 echo $CONDA_PREFIX
 [ "$CONDA_PREFIX" = "$PWD/built-conda-test-env" ] || exit 1
-[ $(python -c "import sys; print(sys.version_info[1])") = 5 ] || exit 1
+[ $(python -c "import sys; print(sys.version_info[1])") = 9 ] || exit 1
+python -c '__requires__ = ["ruamel_yaml_conda >= 0.11.14"]; import pkg_resources' || exit 1
 conda deactivate
 py.test tests -m "not integration and not installed" -vv
diff --git a/dev/start b/dev/start
index 5cff71333a0..2c2bccb69d7 100644
--- a/dev/start
+++ b/dev/start
@@ -28,6 +28,7 @@ if ! [ -f "$devenv/conda-meta/history" ]; then
         fi
         cmd.exe /c "start /wait \"\" miniconda${pyver}.exe /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /S /D=%CD%\$(cygpath -w $devenv)"
         _CONDA="$devenv/Scripts/conda"
+        "$devenv/Scripts/conda" install -yq -p $devenv python=$pyver --file dev/test-requirements.txt -c defaults -c conda-forge
     fi
 fi
 
diff --git a/setup.py b/setup.py
index 7a9bb004a3d..5c6b8169d25 100644
--- a/setup.py
+++ b/setup.py
@@ -41,9 +41,9 @@
 ]
 
 if os.getenv('CONDA_BUILD', None) == '1':
-    install_requires.append("ruamel_yaml >=0.11.14")
+    install_requires.append("ruamel_yaml_conda >=0.11.14")
 else:
-    install_requires.append("ruamel.yaml >=0.11.14")
+    install_requires.append("ruamel_yaml_conda >=0.11.14")
 
 
 def package_files(*root_directories):