diff --git a/.travis.yml b/.travis.yml
index 57985a0..92f4f0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,49 +2,25 @@ sudo: required
 dist: trusty
 language: python
 python:
- - "2.7_with_system_site_packages"
+    - "2.7_with_system_site_packages"
 
 before_install:
- - sudo apt-get install -y curl
- - sudo apt-get install -y python-dev
- - sudo apt-get install -y libssl-dev
- - sudo apt-add-repository ppa:bitcoin/bitcoin -y
- - sudo apt-get update -q
- - sudo apt-get install --no-install-recommends --no-upgrade -qq bitcoind
- - sudo apt-get install -y build-essential
- - sudo apt-get install -y automake
- - sudo apt-get install -y pkg-config
- - sudo apt-get install -y libtool
- - sudo apt-get install -y libffi-dev
+    - sudo apt-add-repository ppa:bitcoin/bitcoin -y
+    - sudo apt-get update -q
+    - sudo apt-get install --no-install-recommends --no-upgrade -qq bitcoind
+
 install:
- - pip install -r requirements-dev.txt
- - python setupall.py --daemon
- - python setupall.py --client-bitcoin 
+    - ./install.sh
+
+before_script:
+    - source jmvenv/bin/activate
+
 script:
-#install and test libsodium
- - git clone git://github.com/jedisct1/libsodium.git
- - cd libsodium
- - git checkout tags/1.0.4
- - ./autogen.sh
- - ./configure
- - make check
- - sudo make install
- - cd ..
-#set up joinmarket.cfg
- - cp test/regtest_joinmarket.cfg joinmarket.cfg
-#install miniircd
- - git clone git://github.com/Joinmarket-Org/miniircd.git
-#setup bitcoin config file
- - mkdir /home/travis/.bitcoin
- - cp test/bitcoin.conf /home/travis/.bitcoin/.
- - chmod 600 /home/travis/.bitcoin/bitcoin.conf
- - mkdir logs
- - mkdir wallets
- -  python -m py.test --cov=jmclient --cov=jmbitcoin --cov=jmbase --cov=jmdaemon --cov-report html --btcpwd=123456abcdef --btcconf=/home/travis/.bitcoin/bitcoin.conf --btcuser=bitcoinrpc --nirc=2 --ignore jmclient/test/test_wallets.py --ignore test/test_segwit.py
+    - ./test/run_tests.sh
+
 after_success:
- - coveralls
+    - coveralls
+
 branches:
  only:
-  - master 
-  - segwitwallets
-
+    - test_travis
diff --git a/install.sh b/install.sh
index 6258097..7570dee 100755
--- a/install.sh
+++ b/install.sh
@@ -94,7 +94,7 @@ openssl_install ()
     openssl_lib_sig="${openssl_lib_tar}.asc"
     openssl_url='https://www.openssl.org/source'
     openssl_signer_key_url='https://pgp.mit.edu/pks/lookup?op=get&search=0xD9C4D26D0E604491'
-    openssl_signer_key_id='2048R/D9C4D26D0E604491'
+    openssl_signer_key_id='D9C4D26D0E604491'
     openssl_root="${jm_deps}/openssl"
 
     if check_skip_build 'openssl'; then
@@ -220,7 +220,7 @@ libsodium_install ()
     sodium_lib_sig="${sodium_lib_tar}.sig"
     sodium_url='https://download.libsodium.org/libsodium/releases'
     sodium_signer_key_url='https://pgp.mit.edu/pks/lookup?op=get&search=0x210627AABA709FE1'
-    sodium_signer_key_id='4096R/62F25B592B6F76DA'
+    sodium_signer_key_id='62F25B592B6F76DA'
 
     if check_skip_build 'libsodium'; then
         return 0