diff --git a/.travis.yml b/.travis.yml
index 1b66fc956..f84d54a7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,7 @@ services:
 
 addons:
   apt:
-    sources:
-    - ubuntu-toolchain-r-test
     packages:
-    - gcc-5
     - check
     - cmake
     - cmake-data
@@ -22,12 +19,9 @@ install:
   - pip install --user pytest ecdsa curve25519-donna
 
 script:
-  - export CC='gcc-5'
   - make
   - ./tests
   - ./test-openssl 1000
   - ITERS=10 py.test
-  - mkdir _build && cd _build
-  - cmake ..
-  - make
-  - cd .. && cd emscripten && rm trezor-crypto.js && make docker-build && make test-correctness
+  - mkdir _build && cd _build && cmake .. && make && cd ..
+  - cd emscripten && rm trezor-crypto.js && make docker-build && make test-correctness && cd ..
diff --git a/emscripten/.gitignore b/emscripten/.gitignore
index 9947cd122..84f814fcc 100644
--- a/emscripten/.gitignore
+++ b/emscripten/.gitignore
@@ -1,3 +1,2 @@
 node_modules/
 benchmark-browserify.js
-test-browserify.js
diff --git a/emscripten/test-addresses-segwit-p2sh.txt b/emscripten/test-addresses-segwit-p2sh.txt
index 8b06787d8..38db9aa98 100644
--- a/emscripten/test-addresses-segwit-p2sh.txt
+++ b/emscripten/test-addresses-segwit-p2sh.txt
@@ -998,4 +998,3 @@
 35yMma5rqpgtyutNcqDxvLxPH3abCQsBNo
 39nxXxVtuTnUYBhy9zpsMyGJEg4fyMEm8o
 35EEnuD5NCF1QgSYav3K2YePY8k3GADHTK
-3Noz5NS8cfcQL63YWb4or2Vs5baq71p5uw