diff --git a/src/secp256k1/.travis.yml b/src/secp256k1/.travis.yml
index 034359f31..5ba7b9cad 100644
--- a/src/secp256k1/.travis.yml
+++ b/src/secp256k1/.travis.yml
@@ -1,88 +1,102 @@
 language: c
 os: linux
 dist: xenial
 addons:
   apt:
     sources:
       - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
         key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
     packages:
       - cmake
       - libgmp-dev
       - ninja-build
 compiler:
   - clang
   - gcc
 env:
   global:
-    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  RECOVERY=no  SCHNORR=yes  EXPERIMENTAL=no  JNI=no
+    - FIELD=auto
+    - BIGNUM=auto
+    - SCALAR=auto
+    - ENDOMORPHISM=no
+    - STATICPRECOMPUTATION=yes
+    - ASM=no
+    - BUILD=check
+    - AUTOTOOLS_EXTRA_FLAGS=
+    - CMAKE_EXTRA_FLAGS=
+    - HOST=
+    - ECDH=no
+    - RECOVERY=no
+    - SCHNORR=yes
+    - EXPERIMENTAL=no
+    - JNI=no
   jobs:
     - SCALAR=32bit    RECOVERY=yes
     - SCALAR=32bit    FIELD=32bit       ECDH=yes  EXPERIMENTAL=yes
     - SCALAR=64bit
     - FIELD=64bit     RECOVERY=yes
     - FIELD=64bit     ENDOMORPHISM=yes
     - FIELD=64bit     ENDOMORPHISM=yes  ECDH=yes EXPERIMENTAL=yes
     - FIELD=64bit                       ASM=x86_64
     - FIELD=64bit     ENDOMORPHISM=yes  ASM=x86_64
     - FIELD=32bit     ENDOMORPHISM=yes
     - BIGNUM=no
     - BIGNUM=no       ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=yes
     - BIGNUM=no       STATICPRECOMPUTATION=no
     - BUILD=distcheck
-    - EXTRAFLAGS=CPPFLAGS=-DDETERMINISTIC
-    - EXTRAFLAGS=CFLAGS=-O0
+    - AUTOTOOLS_EXTRA_FLAGS=CPPFLAGS=-DDETERMINISTIC CMAKE_EXTRA_FLAGS=-DCMAKE_C_FLAGS=-DDETERMINISTIC
+    - AUTOTOOLS_EXTRA_FLAGS=CFLAGS=-O0               CMAKE_EXTRA_FLAGS=-DCMAKE_C_FLAGS=-O0
     - BUILD=check-java JNI=yes ECDH=yes EXPERIMENTAL=yes
     - SCHNORR=no
 jobs:
   fast_finish: true
   include:
     - compiler: clang
       env: HOST=i686-linux-gnu ENDOMORPHISM=yes
       addons:
         apt:
           sources:
             - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
               key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
           packages:
             - cmake
             - gcc-multilib
             - libgmp-dev:i386
             - ninja-build
     - compiler: clang
       env: HOST=i686-linux-gnu BIGNUM=no
       addons:
         apt:
           sources:
             - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
               key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
           packages:
             - cmake
             - gcc-multilib
             - ninja-build
     - compiler: gcc
       env: HOST=i686-linux-gnu ENDOMORPHISM=yes BIGNUM=no
       addons:
         apt:
           sources:
             - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
               key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
           packages:
             - cmake
             - gcc-multilib
             - ninja-build
     - compiler: gcc
       env: HOST=i686-linux-gnu
       addons:
         apt:
           sources:
             - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
               key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
           packages:
             - cmake
             - gcc-multilib
             - libgmp-dev:i386
             - ninja-build
 script:
  - ./travis/build_autotools.sh
  - ./travis/build_cmake.sh
diff --git a/src/secp256k1/travis/build_autotools.sh b/src/secp256k1/travis/build_autotools.sh
index c6370b53b..d7c59799f 100755
--- a/src/secp256k1/travis/build_autotools.sh
+++ b/src/secp256k1/travis/build_autotools.sh
@@ -1,36 +1,36 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C
 
 set -ex
 
 if [ -n "$HOST" ]; then
   USE_HOST="--host=$HOST"
 fi
 
 if [ "x$HOST" = "xi686-linux-gnu" ]; then
   CC="$CC -m32"
 fi
 
 ./autogen.sh
 
 mkdir buildautotools
 pushd buildautotools
 
 ../configure \
   --enable-experimental=$EXPERIMENTAL \
   --enable-endomorphism=$ENDOMORPHISM \
   --with-field=$FIELD \
   --with-bignum=$BIGNUM \
   --with-scalar=$SCALAR \
   --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION \
   --enable-module-ecdh=$ECDH \
   --enable-module-recovery=$RECOVERY \
   --enable-module-schnorr=$SCHNORR \
   --enable-jni=$JNI \
-  $EXTRAFLAGS \
+  $AUTOTOOLS_EXTRA_FLAGS \
   $USE_HOST
 
 make -j2 $BUILD
 
 popd