diff --git a/.appveyor.yml b/.appveyor.yml
index 654c2e4c..821a03f7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -65,9 +65,7 @@ install:
 build: false
 
 before_test:
-  - mkdir bin
-  - mklink "bin\ld.exe" "C:\Program Files\LLVM\bin\lld.exe"
-  - set PATH=%CD%\bin;C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
+  - set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
   - rustup component add rust-src
   - set RUST_BACKTRACE=1
   - if not exist %USERPROFILE%\.cargo\bin\cargo-install-update.exe cargo install cargo-update
diff --git a/.travis.yml b/.travis.yml
index 55bd2489..da67f69c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,29 +19,12 @@ os:
   - linux
   - osx
 
-addons:
-  apt:
-    sources:
-      - llvm-toolchain-trusty-5.0
-    packages:
-      - lld-5.0
-
 cache:
   directories:
     - $HOME/.cargo
     - $HOME/.xargo
     - $TRAVIS_BUILD_DIR/target
 
-before_install:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      set -e
-      LLVM_URL="https://releases.llvm.org/5.0.1/clang+llvm-5.0.1-x86_64-apple-darwin.tar.xz"
-      travis_retry wget -O llvm.tar.xz -nv ${LLVM_URL}
-      tar -xJ -f llvm.tar.xz
-      export PATH="`pwd`/clang+llvm-5.0.1-final-x86_64-apple-darwin/bin:$PATH"
-    fi
-
 before_script:
   - rustup component add rust-src
   - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)