diff --git a/ci/docker/x86_64-unknown-freebsd/Dockerfile b/ci/docker/x86_64-unknown-freebsd/Dockerfile
index b1273382..12b0bdff 100644
--- a/ci/docker/x86_64-unknown-freebsd/Dockerfile
+++ b/ci/docker/x86_64-unknown-freebsd/Dockerfile
@@ -8,6 +8,6 @@ RUN apt-get install -y --no-install-recommends \
 ENTRYPOINT ["sh"]
 
 ENV PATH=$PATH:/rust/bin \
-    QEMU=freebsd.qcow2.gz \
+    QEMU=2016-11-06/freebsd.qcow2.gz \
     CAN_CROSS=1 \
     CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-gcc
diff --git a/ci/docker/x86_64-unknown-openbsd/Dockerfile b/ci/docker/x86_64-unknown-openbsd/Dockerfile
index 26340a5e..518baf87 100644
--- a/ci/docker/x86_64-unknown-openbsd/Dockerfile
+++ b/ci/docker/x86_64-unknown-openbsd/Dockerfile
@@ -5,4 +5,4 @@ RUN apt-get install -y --no-install-recommends \
   gcc libc6-dev qemu curl ca-certificates \
   genext2fs
 ENV PATH=$PATH:/rust/bin \
-    QEMU=2016-09-07/openbsd-6.0-without-pkgs.qcow2
+    QEMU=2016-11-06/openbsd-6.0-without-pkgs.qcow2
diff --git a/ci/run.sh b/ci/run.sh
index 15721ab9..179fe7a8 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -21,14 +21,14 @@ if [ "$QEMU" != "" ]; then
     # image is .gz : download and uncompress it
     qemufile=$(echo ${QEMU%.gz} | sed 's/\//__/g')
     if [ ! -f $tmpdir/$qemufile ]; then
-      curl https://people.mozilla.org/~acrichton/libc-test/qemu/$QEMU | \
+      curl https://s3.amazonaws.com/rust-lang-ci/libc/$QEMU | \
         gunzip -d > $tmpdir/$qemufile
     fi
   else
     # plain qcow2 image: just download it
     qemufile=$(echo ${QEMU} | sed 's/\//__/g')
     if [ ! -f $tmpdir/$qemufile ]; then
-      curl https://people.mozilla.org/~acrichton/libc-test/qemu/$QEMU \
+      curl https://s3.amazonaws.com/rust-lang-ci/libc/$QEMU \
         > $tmpdir/$qemufile
     fi
   fi