diff --git a/.travis.yml b/.travis.yml
index cbe61a83fde5db175a59d0cebe2c0144464b61b5..e1fbd40bd6bcdc444bb74f2f4a3e791fd45f338e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,32 @@
 language: c
-compiler:
-  - gcc
-  - clang
-os:
-  - linux
-  - osx
+matrix:
+    include:
+        - os: linux
+          compiler: gcc
+
+        - os: linux
+          compiler: clang
+
+        - os: osx
+          compiler: gcc
+
+        - os: osx
+          compiler: clang
+
+        - os: linux
+          compiler: gcc
+          env: CONFIGURE_OPTS=--enable-64-bit-words
+
+        - os: linux
+          compiler: clang
+          env: CONFIGURE_OPTS=--enable-64-bit-words
+
+        - os: osx
+          compiler: gcc
+          env: CONFIGURE_OPTS=--enable-64-bit-words
+
+        - os: osx
+          compiler: clang
+          env: CONFIGURE_OPTS=--enable-64-bit-words
 script:
-  - ./autogen.sh && ./configure && make && make check
-  - make clean && ./configure --enable-64-bit-words && make && make check
+  - ./autogen.sh && ./configure $CONFIGURE_OPTS && make && make check