diff --git a/.appveyor.yml b/.appveyor.yml
index 9ff77eb4..a2019554 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,6 +40,8 @@ install:
 
 build_script:
   - set B=release
+  - cd c:\projects\upx
+#  - if "%C%"=="gcc-m64" ( bash -x ./.github/travis_build.sh && exit 0 ) # TODO
   - set DEFS=-D_CRT_SECURE_NO_WARNINGS
   - set BDIR=c:\projects\build\%C%\%B%
   - mkdir %BDIR% %BDIR%\ucl-1.03 %BDIR%\upx %BDIR%\upx-testsuite %BDIR%\zlib-1.2.8
@@ -54,11 +56,14 @@ build_script:
   - set s=c:\projects\upx\src
   - cl -MT -EHsc -O2 -W4 -wd4244 %DEFS% -DWITH_LZMA=0x443 -DUCL_NO_ASM -I%s%\lzma-sdk -Ic:\projects\deps\ucl-1.03\include -Ic:\projects\deps\zlib-1.2.8 -Feupx.exe %s%\*.cpp %BDIR%\ucl-1.03\ucl.lib %BDIR%\zlib-1.2.8\zlib.lib
 
+
 test_script:
   - cd %BDIR%\upx
   - .\upx.exe --version
   - .\upx.exe upx.exe -o upx_packed.exe
   - dir *.exe
   - .\upx_packed.exe --version
+  - cd c:\projects\upx
+  - bash ./.github/travis_testsuite_1.sh
 
 # vim:set ts=2 sw=2 et:
diff --git a/.github/travis_init.sh b/.github/travis_init.sh
index 375bc788..673c58db 100644
--- a/.github/travis_init.sh
+++ b/.github/travis_init.sh
@@ -62,3 +62,8 @@ cd / && cd $upx_testsuite_SRCDIR || exit 1
 cd / && cd $upx_BUILDDIR || exit 1
 # enter srcdir
 cd / && cd $upx_SRCDIR || exit 1
+
+# for some reason this is needed for bash on AppVeyor
+sort() {
+    /usr/bin/sort "$@"
+}
diff --git a/.github/travis_testsuite_1.sh b/.github/travis_testsuite_1.sh
index 7a3fefbe..8bbc67ee 100644
--- a/.github/travis_testsuite_1.sh
+++ b/.github/travis_testsuite_1.sh
@@ -8,34 +8,38 @@ set -e; set -o pipefail
 source ./.github/travis_init.sh || exit 1
 
 
+#
+# very first version of the upx-testsuite
+#
+
+
+# /***********************************************************************
+# // support functions
+# ************************************************************************/
+
 testsuite_header() {
-    local x="======================================================"
+    local x="========"; x="$x$x$x$x$x$x$x$x$x"
     echo -e "\n${x}\n${1}\n${x}\n"
 }
 
 testsuite_split_f() {
-    fd= fb= fs= fe= fsubdir=
     fd=$(dirname "$1")
     fb=$(basename "$1")
-    # fs: short basename - remove known executable extensions
-    fs=$fb
-    case $fb in *.com | *.dll | *.exe | *.out | *.so | *.sys | *.ttp)
-        fs="${fb%.*}"
-        fe=".${fb##*.}"
-    esac
     fsubdir=$(basename "$fd")
     # sanity checks
-    if [[ -d $f || -z $fsubdir || -z $fs ]]; then
-        fd= fb= fs= fe= fsubdir=
+    if [[ ! -f $f || -z $fsubdir || -z $fb ]]; then
+        fd= fb= fsubdir=
     fi
 }
 
 testsuite_check_sha() {
-    (cd "$1" && LC_ALL=C $sha256sum -b */* > .sha256sums.current)
+    (cd "$1" && $sha256sum -b */* | LC_ALL=C sort -k2) > $1/.sha256sums.current
     cat $1/.sha256sums.current
     if ! cmp -s $1/.sha256sums.current $1/.sha256sums.expected; then
+        echo "UPX-ERROR: checksum mismatch"
         diff -u $1/.sha256sums.current $1/.sha256sums.expected || true
-        exit 1
+        #exit 1
+        exit_code=1
     fi
 }
 
@@ -47,48 +51,42 @@ testsuite_run_compress() {
         [[ -z $fb ]] && continue
         mkdir -p $t/$fsubdir
         ff=t01_decompressed/$fsubdir/$fb
-        $upx --prefer-ucl "$@" $ff -o $t/$fsubdir/$fb
+        $upx_exe --prefer-ucl "$@" $ff -o $t/$fsubdir/$fb
     done
     testsuite_check_sha "$t"
-    $upx -l $t/*/*
-    $upx --file-info $t/*/*
-    $upx -t $t/*/*
+    $upx_exe -l $t/*/*
+    $upx_exe --file-info $t/*/*
+    $upx_exe -t $t/*/*
 }
 
-
+# /***********************************************************************
+# // init
+# ************************************************************************/
 
 #set -x
+exit_code=0
 
-cd $upx_BUILDDIR || exit 1
 if [[ $ALLOW_FAIL == 1 ]]; then
     echo "ALLOW_FAIL=$ALLOW_FAIL"
     set +e
-    if [[ ! -x $PWD/upx.out ]]; then exit 0; fi
 fi
-if [[ ! -x $PWD/upx.out ]]; then exit 1; fi
 
-#
-# very first version of the upx-testsuite
-#
+if [[ ! -d $upx_testsuite_SRCDIR/files/packed ]]; then exit 1; fi
 
-exit_code=0
+[[ -z $upx_exe && -f $upx_BUILDDIR/upx.out ]] && upx_exe=$upx_BUILDDIR/upx.out
+[[ -z $upx_exe && -f $upx_BUILDDIR/upx.exe ]] && upx_exe=$upx_BUILDDIR/upx.exe
+if [[ ! -f $upx_exe ]]; then exit 1; fi
+if [[ ! -x $upx_exe ]]; then exit 1; fi
 
 sha256sum=sha256sum
 if [[ $TRAVIS_OS_NAME == osx ]]; then
     sha256sum=gsha256sum # brew install coreutils
 fi
-upx=$PWD/upx.out
 if [[ $B =~ (^|\+)valgrind($|\+) ]]; then
     valgrind_flags="--leak-check=full --show-reachable=yes"
     valgrind_flags="-q --leak-check=no --error-exitcode=1"
     valgrind_flags="--leak-check=no --error-exitcode=1"
-    upx="valgrind $valgrind_flags $upx"
-fi
-upx_391=
-if [[ $TRAVIS_OS_NAME == linux ]]; then
-    rm -f upx391.out
-    cp $upx_testsuite_SRCDIR/files/packed/amd64-linux.elf/upx-3.91 upx391.out
-    upx_391="$PWD/upx391.out --fake-stub-version=3.92 --fake-stub-year=2016"
+    upx_exe="valgrind $valgrind_flags $upx_exe"
 fi
 
 if [[ $B =~ (^|\+)coverage($|\+) ]]; then
@@ -103,15 +101,16 @@ cd testsuite_1
 export UPX=
 export UPX="--no-progress"
 
-#
-# test 01
-#
+
+# /***********************************************************************
+# // decompression tests
+# ************************************************************************/
 
 t=t01_decompressed
 mkdir $t; echo -n "\
 24158f78c34c4ef94bb7773a6dda7231d289be76c2f5f60e8b9ddb3f800c100e *amd64-linux.elf/upx-3.91
-b1c1c38d50007616aaf8e942839648c80a6111023e0b411e5fa7a06c543aeb4a *armeb-linux.elf/upx-3.91
 28d7ca8f0dfca8159e637eaf2057230b6e6719e07751aca1d19a45b5efed817c *arm-wince.pe/upx-3.91.exe
+b1c1c38d50007616aaf8e942839648c80a6111023e0b411e5fa7a06c543aeb4a *armeb-linux.elf/upx-3.91
 bcac77a287289301a45fde9a75e4e6c9ad7f8d57856bae6eafaae12ae4445a34 *i386-dos32.djgpp2.coff/upx-3.91.exe
 730a513b72a094697f827e4ac1a4f8ef58a614fc7a7ad448fa58d60cd89af7ed *i386-linux.elf/upx-3.91
 0dbc3c267ca8cd35ee3ea138b59c8b1ae35872c918be6d17df1a892b75710f9b *i386-win32.pe/upx-3.91.exe
@@ -119,25 +118,26 @@ bcac77a287289301a45fde9a75e4e6c9ad7f8d57856bae6eafaae12ae4445a34 *i386-dos32.djg
 c3f44b4d00a87384c03a6f9e7aec809c1addfe3e271244d38a474f296603088c *mipsel-linux.elf/upx-3.91
 b8c35fa2956da17ca505956e9f5017bb5f3a746322647e24ccb8ff28059cafa4 *powerpc-linux.elf/upx-3.91
 " > $t/.sha256sums.expected
+
 testsuite_header "$t"
 for f in $upx_testsuite_SRCDIR/files/packed/*/upx-3.91*; do
     testsuite_split_f "$f"
     [[ -z $fb ]] && continue
     mkdir -p $t/$fsubdir
-    $upx -d $f -o $t/$fsubdir/$fb
+    $upx_exe -d $f -o $t/$fsubdir/$fb
 done
 testsuite_check_sha "$t"
 
-#
-# test 02
-#
 
+# /***********************************************************************
+# // compression tests
+# ************************************************************************/
 
 t=t02_compress_ucl_3_no_filter
 mkdir $t; echo -n "\
 3dd2564078aa15d35fbf70928cdb094697c4ef8909bd711c7a3bd79eb18ab400 *amd64-linux.elf/upx-3.91
-ea42d52676d2698f29587e98a9e1536b96ebf523a7d8bc926f6c241a159b4116 *armeb-linux.elf/upx-3.91
 16c0493d4d89e6c581748826afd26d2b4caeeae6074b0bdcf55747a4bc9777a5 *arm-wince.pe/upx-3.91.exe
+ea42d52676d2698f29587e98a9e1536b96ebf523a7d8bc926f6c241a159b4116 *armeb-linux.elf/upx-3.91
 27f1afd1e1fec37d4dcd43163b9ec60a6af3abeab21a4adf539b7faea848eb20 *i386-dos32.djgpp2.coff/upx-3.91.exe
 5edf3dcfd0458b0f23c19e6c44b4c54a5457bc34c3bf045b37678d4f96301e00 *i386-linux.elf/upx-3.91
 a94d5ff62c061d60d64e838ea4bb7610a75cf26a0761b26f9da0efbd38e87ebe *i386-win32.pe/upx-3.91.exe
@@ -150,8 +150,8 @@ time testsuite_run_compress -3 --no-filter
 t=t03_compress_lzma_1_no_filter
 mkdir $t; echo -n "\
 542124e236f4dc3ba92de02a07f29df3d8a015bb9f3a5a9681c978746b16e0df *amd64-linux.elf/upx-3.91
-07ca9736f1cd478bde2c8da95a6ecb95bd865dcf8ea48a396b13050ac40d196e *armeb-linux.elf/upx-3.91
 99ad77f2280a5b4791ead800c7d4d5b29aa49ce40319616f682c1b29ddf20702 *arm-wince.pe/upx-3.91.exe
+07ca9736f1cd478bde2c8da95a6ecb95bd865dcf8ea48a396b13050ac40d196e *armeb-linux.elf/upx-3.91
 9e852e95b38ca57319d1e911bf97226a82b60dd336e201496c30bf62943aecce *i386-dos32.djgpp2.coff/upx-3.91.exe
 e408fbcbbe422c06fce0cfed5d28ea0f0ef7c1b9225bf1f5a7d789cc84fb93b8 *i386-linux.elf/upx-3.91
 e249633d550abe84953a15668e3d74660fd63e9e935bec8564d9df08116b015d *i386-win32.pe/upx-3.91.exe
@@ -164,8 +164,8 @@ time testsuite_run_compress -1 --lzma --no-filter
 t=t04_compress_ucl_2_all_filters
 mkdir $t; echo -n "\
 bde869b9b0e29c7930591b3582ef3e864db7757d774082d772df8f6b874e6fd6 *amd64-linux.elf/upx-3.91
-db894f24777334abb9bf8e34661d057e25c2889b46290cf83db7310c4cdd86fa *armeb-linux.elf/upx-3.91
 247e385b1bf2559982cfedde0dc6dafc3fe99ad09100afc8b6ec3e59722afd4f *arm-wince.pe/upx-3.91.exe
+db894f24777334abb9bf8e34661d057e25c2889b46290cf83db7310c4cdd86fa *armeb-linux.elf/upx-3.91
 33bde57c3f7ed8809bec0658fe6c48d047bdec97476643f2e8e2970ab0c4eb5f *i386-dos32.djgpp2.coff/upx-3.91.exe
 7f4ad752cab7db426356eb5068e37d06bade2422b6012069814dcfadae7e2cca *i386-linux.elf/upx-3.91
 32c7dd51179084d7191b57016dc9e508137f3e55ba59118dfbd1c4205f730790 *i386-win32.pe/upx-3.91.exe
@@ -178,8 +178,8 @@ time testsuite_run_compress -2 --all-filters
 t=t05_compress_all_methods_1_no_filter
 mkdir $t; echo -n "\
 542124e236f4dc3ba92de02a07f29df3d8a015bb9f3a5a9681c978746b16e0df *amd64-linux.elf/upx-3.91
-07ca9736f1cd478bde2c8da95a6ecb95bd865dcf8ea48a396b13050ac40d196e *armeb-linux.elf/upx-3.91
 99ad77f2280a5b4791ead800c7d4d5b29aa49ce40319616f682c1b29ddf20702 *arm-wince.pe/upx-3.91.exe
+07ca9736f1cd478bde2c8da95a6ecb95bd865dcf8ea48a396b13050ac40d196e *armeb-linux.elf/upx-3.91
 9e852e95b38ca57319d1e911bf97226a82b60dd336e201496c30bf62943aecce *i386-dos32.djgpp2.coff/upx-3.91.exe
 e408fbcbbe422c06fce0cfed5d28ea0f0ef7c1b9225bf1f5a7d789cc84fb93b8 *i386-linux.elf/upx-3.91
 e249633d550abe84953a15668e3d74660fd63e9e935bec8564d9df08116b015d *i386-win32.pe/upx-3.91.exe
@@ -192,8 +192,8 @@ time testsuite_run_compress -1 --all-methods --no-filter
 t=t06_compress_all_methods_no_lzma_no_filter
 mkdir $t; echo -n "\
 6e669ac40043287516be85ddce6e4ac9d41d4e550ea080e23f9dfde7fff8fd64 *amd64-linux.elf/upx-3.91
-b95b5a9a1ba4577df41c135b0061a7282e633f006ce6a5c729d73a708f80c0f0 *armeb-linux.elf/upx-3.91
 63be06791e4caa5ea530bd58d0fe5af7830fe6907cebb4de6eec5a73ff57bf58 *arm-wince.pe/upx-3.91.exe
+b95b5a9a1ba4577df41c135b0061a7282e633f006ce6a5c729d73a708f80c0f0 *armeb-linux.elf/upx-3.91
 bbf7d2290c2aff5c914f14aaa7a089895888f3e25b468ba406f9723c046b0ccb *i386-dos32.djgpp2.coff/upx-3.91.exe
 b615ce3f45d7b727594c550cb2066fff154653ffd64a5329ee6723175224cc47 *i386-linux.elf/upx-3.91
 a647ed1aea16f58b544228279ad7159cd3ec5c3533efef1fd2df5a5a59b5d663 *i386-win32.pe/upx-3.91.exe
@@ -205,5 +205,9 @@ time testsuite_run_compress --all-methods --no-lzma --no-filter
 
 
 echo
-echo "UPX testsuite passed. All done."
+if [[ $exit_code == 0 ]]; then
+    echo "UPX testsuite passed. All done."
+else
+    echo "UPX-ERROR: UPX testsuite FAILED. See log file."
+fi
 exit $exit_code