diff --git a/.travis.yml b/.travis.yml
index 2761cd1b..30ea3fda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ matrix:
       before_install:
         - pip3 install -r requirements.txt
       before_script:
+        - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
         - git fetch --unshallow
       script:
         - "cd test && python3 -m nose --rednose --verbose"
@@ -28,6 +29,7 @@ matrix:
       env:
         PQCLEAN_ONLY_DIFF: 1
       before_install:
+        - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
         - git fetch --unshallow
         - pip3 install -r requirements.txt
         - brew link gcc
diff --git a/appveyor.yml b/appveyor.yml
index eccf644b..cba69d42 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,6 +22,8 @@ init:
   - set PATH="C:\\Python37";"C:\\Python37\Scripts";%PATH%
 
 build_script:
+  - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
+  - git fetch
   - python -m pip install -r requirements.txt
   - cd test
     # Download Astyle to local folder because putting it in PATH doesn't work