diff --git a/.travis.yml b/.travis.yml
index 75996a852..5588f54da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ install:
       else
           # This list of -Wno-error options should be reduced over time where possible
           if [ x"$TRAVIS_COMPILER" != x"clang" ]; then
-              CFLAGS="-Wno-error=empty-body -Wno-error=shadow -Wno-error=unused-value -Wno-error=unused-but-set-variable -Wno-error=bad-function-cast -Wno-error=unused-function -Wno-error=unused-result -Wno-error=deprecated-declarations" ../configure --enable-developer --srcdir=`dirname "$PWD"` --enable-maintainer-mode $COVERAGE
+              CFLAGS="-Wno-error=empty-body -Wno-error=shadow -Wno-error=unused-value -Wno-error=bad-function-cast -Wno-error=unused-function -Wno-error=unused-result -Wno-error=deprecated-declarations" ../configure --enable-developer --srcdir=`dirname "$PWD"` --enable-maintainer-mode $COVERAGE
           else
               CFLAGS="-Wno-error=shadow -Wno-error=bad-function-cast -Wno-error=unused-function -Wno-error=unused-result -Wno-error=deprecated-declarations" ../configure --enable-developer --srcdir=`dirname "$PWD"` --enable-maintainer-mode $COVERAGE
           fi
diff --git a/lib/hcrypto/rsa-ltm.c b/lib/hcrypto/rsa-ltm.c
index a52ad1391..2852bd4d6 100644
--- a/lib/hcrypto/rsa-ltm.c
+++ b/lib/hcrypto/rsa-ltm.c
@@ -132,7 +132,7 @@ ltm_rsa_private_calculate(mp_int * in, mp_int * p,  mp_int * q,
 {
     mp_err ret;
     mp_int vp, vq, u;
-    int where = 0; /* Ignore the set-but-unused warning from this */
+    int where HEIMDAL_UNUSED_ATTRIBUTE = 0;
 
     FIRST(mp_init_multi(&vp, &vq, &u, NULL));
 
@@ -479,7 +479,7 @@ gen_p(int bits, enum gen_pq_type pq_type, uint8_t nibble_pair, mp_int *p, mp_int
     size_t len = (bits + 7) / 8;
     int trials = mp_prime_rabin_miller_trials(bits);
     int counter = 0;
-    int where = 0; /* Ignore the set-but-unused warning from this */
+    int where HEIMDAL_UNUSED_ATTRIBUTE = 0;
 
 
     FIRST(mp_init_multi(&t1, &t2, NULL));