diff --git a/.travis.yml b/.travis.yml
index 46a6766..05ca0cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@
       compiler: gcc
       env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
     - os: linux
-      env: HOST=moxie-elf MEVAL='export PATH=/opt/moxielogic/bin:$PATH && LDFLAGS="-Tsim.ld" && CC=moxie-elf-gcc && CXX=moxie-elf-g++ && RUNTESTFLAGS="--target_board moxie-sim" && DEJAGNU="$TRAVIS_BUILD_DIR"/.travis'
+      env: HOST=moxie-elf MEVAL='export PATH=/opt/moxielogic/bin:$PATH && LDFLAGS="-Tsim.ld" && RUNTESTFLAGS="--target_board moxie-sim" && DEJAGNU="$TRAVIS_BUILD_DIR"/.travis && CC=moxie-elf-gcc && CXX=moxie-elf-g++'
 
 before_install:
   - if test x"$MEVAL" != x; then eval ${MEVAL}; fi
@@ -28,7 +28,10 @@
 script:
   - echo $MEVAL
   - env
-  - ./autogen.sh
+  - if test x"$MEVAL" != x; then eval ${MEVAL}; fi
+  - echo ------------------------------------------
+  - if test x"$MEVAL" != x; then eval ${MEVAL}; fi
+- ./autogen.sh
   - ./configure ${HOST+--host=$HOST} ${CONFIGURE_OPTIONS}
   - make
   - make dist