diff --git a/.travis.yml b/.travis.yml
index 80bd615b41..1263695a86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,8 @@ language: node_js
 sudo: required
 
 os:
-  - linux
   - windows
-
-# fix travis windows hanging issue
-# https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288/25
-env: YARN_GPG=no
+  - linux
 
 node_js:
   - "6"
@@ -40,10 +36,18 @@ cache:
   directories:
     - "$TRAVIS_BUILD_DIR/stunnel-5.54"
 
-after_success: npm run coveralls
 before_script:
   # Add an IPv6 config - see the corresponding Travis issue
   # https://github.com/travis-ci/travis-ci/issues/8361
   - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
     sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
     fi
+after_script:
+  - |-
+    case $TRAVIS_OS_NAME in
+      windows)
+        redis-server --service-stop
+    ;;
+    esac
+
+after_success: npm run coveralls