diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 827f946a44f6f7bd7dd3209bab5e922e59e202c7..05d44f910fa2795e9ac4899045f162aea8003774 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    sha: v0.7.1
+    sha: v0.8.0
     hooks:
     -   id: check-added-large-files
     -   id: check-merge-conflict
@@ -8,10 +8,10 @@
     sha: v0.5.4
     hooks:
     -   id: shell-lint
-        files: &shellscripts 'merge-conflict'
+        files: &shellscripts '^merge-conflict$'
     -   id: shellcheck
         files: *shellscripts
--   repo: ./
-    sha: HEAD
+-   repo: https://www.shore.co.il/git/git-pre-commit/
+    sha: master
     hooks:
     - id: merge-conflict
diff --git a/.travis.yml b/.travis.yml
index 3b4d00804dcf9b04eed359b8d8b6c4a4a7503591..8190b8636d3e92c287a0014d8c93cfba6ed6fe4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 ---
-language: python
-python: "3.6"
 dist: trusty
 sudo: false
 group: beta
@@ -11,22 +9,31 @@ cache:
       - $HOME/.cabal
       - $HOME/.ghc
 
-addons:
-  apt:
-    packages:
-      - cabal-install
-      - ghc
-
-env:
-    PATH: "$HOME/bats/bin:$HOME/.cabal/bin:$PATH"
-
-install:
-  - cabal update && cabal install shellcheck
-  - pip install pre_commit | cat
-  - git clone --depth 1 https://github.com/sstephenson/bats.git "$HOME/bats"
-
-script:
-  - pre-commit run --all-files
+matrix:
+    fast_finish: True
+    include:
+        - language: python
+          python: "3.6"
+          env:
+              PATH: "$HOME/.cabal/bin:$PATH"
+          addons:
+            apt:
+              packages:
+                  - cabal-install
+                  - ghc
+          install:
+              - cabal update && cabal install shellcheck
+              - pip install pre_commit | cat
+              - pre-commit install-hooks
+          script:
+              - pre-commit run --all-files
+        - language: shell
+          env:
+              PATH: "$HOME/bats/bin:$PATH"
+          install:
+              - git clone --depth 1 https://github.com/sstephenson/bats.git "$HOME/bats"
+          script:
+              bats -t tests/
 
 notifications:
   on_failure: never