diff --git a/check/check_7za.sh b/check/check_7za.sh
new file mode 100644
index 000000000..e40e995b2
--- /dev/null
+++ b/check/check_7za.sh
@@ -0,0 +1,162 @@
+#! /bin/sh
+
+sure()
+{
+  eval $*
+  if [ "$?" != "0" ]
+  then
+    echo "ERROR during : $*"
+    echo "ERROR during : $*" > last_error
+    exit 1
+  fi
+}
+
+#set -x
+
+P7ZIP="$@"
+P7ZIP="${TOOLS} ${P7ZIP}" 
+
+REP=TMP_$$
+echo "REP=${REP}"
+echo "P7ZIP=${P7ZIP}"
+echo "TOOLS=${TOOLS}"
+
+chmod -R 777 ${REP} 2> /dev/null
+rm -fr   ${REP}
+mkdir -p ${REP}
+
+cd ${REP}
+
+# sure rm -fr 7za433_ref 7za433_7zip_bzip2 7za433_7zip_lzma 7za433_7zip_lzma_crypto 7za433_7zip_ppmd 7za433_tar
+# sure rm -fr 7za433_7zip_bzip2.7z 7za433_7zip_lzma.7z 7za433_7zip_lzma_crypto.7z 7za433_7zip_ppmd.7z 7za433_tar.tar
+
+echo ""
+echo "# TESTING ..."
+echo "#############"
+
+sure ${P7ZIP} t ../test/7za433_tar.tar
+sure ${P7ZIP} t ../test/7za433_7zip_lzma.7z
+sure ${P7ZIP} t -pqwerty ../test/7za433_7zip_lzma_crypto.7z
+sure ${P7ZIP} t ../test/7za433_7zip_ppmd.7z
+sure ${P7ZIP} t ../test/7za433_7zip_bzip2.7z
+
+echo ""
+echo "# EXTRACTING ..."
+echo "################"
+
+sure tar xf ../test/7za433_tar.tar
+sure mv 7za433_tar 7za433_ref
+
+sure ${P7ZIP} x ../test/7za433_tar.tar
+sure diff -r 7za433_ref 7za433_tar
+
+sure ${P7ZIP} x ../test/7za433_7zip_lzma.7z
+sure diff -r 7za433_ref 7za433_7zip_lzma
+
+sure ${P7ZIP} x ../test/7za433_7zip_lzma_bcj2.7z
+sure diff -r 7za433_ref 7za433_7zip_lzma_bcj2
+
+sure ${P7ZIP} x -pqwerty ../test/7za433_7zip_lzma_crypto.7z
+sure diff -r 7za433_ref 7za433_7zip_lzma_crypto
+
+sure ${P7ZIP} x ../test/7za433_7zip_ppmd.7z
+sure diff -r 7za433_ref 7za433_7zip_ppmd
+
+sure ${P7ZIP} x ../test/7za433_7zip_ppmd_bcj2.7z
+sure diff -r 7za433_ref 7za433_7zip_ppmd_bcj2
+
+sure ${P7ZIP} x ../test/7za433_7zip_bzip2.7z
+sure diff -r 7za433_ref 7za433_7zip_bzip2
+
+echo ""
+echo "# Archiving ..."
+echo "###############"
+
+sure ${P7ZIP} a -ttar 7za433_tar.tar 7za433_tar
+sure tar tvf 7za433_tar.tar
+
+sure ${P7ZIP} a 7za433_7zip_lzma.7z 7za433_7zip_lzma
+
+sure ${P7ZIP} a -sfx7zCon.sfx 7za433_7zip_lzma.x 7za433_7zip_lzma
+
+sure ${P7ZIP} a -pqwerty -mhc=on -mhe=on 7za433_7zip_lzma_crypto.7z 7za433_7zip_lzma_crypto # -p = password
+
+sure ${P7ZIP} a -mx=9 -m0=ppmd:mem=64m:o=32 7za433_7zip_ppmd.7z 7za433_7zip_ppmd
+
+sure ${P7ZIP} a -m0=bzip2 7za433_7zip_bzip2.7z 7za433_7zip_bzip2
+
+echo ""
+echo "# EXTRACTING (PASS 2) ..."
+echo "#########################"
+
+sure rm -fr 7za433_7zip_bzip2 7za433_7zip_lzma 7za433_7zip_lzma_crypto 7za433_7zip_ppmd 7za433_tar
+
+sure ${P7ZIP} x 7za433_tar.tar
+sure diff -r 7za433_ref 7za433_tar
+
+sure ${P7ZIP} x 7za433_7zip_lzma.7z
+sure diff -r 7za433_ref 7za433_7zip_lzma
+
+sure rm -fr 7za433_7zip_lzma
+# FIXME - only for 7zG
+sure chmod +x ./7za433_7zip_lzma.x
+# sure ${P7ZIP} x -sfx7zCon.sfx 7za433_7zip_lzma.x
+sure ${TOOLS} ./7za433_7zip_lzma.x
+sure diff -r 7za433_ref 7za433_7zip_lzma
+sure rm -rf 7za433_7zip_lzma
+
+sure ${P7ZIP} x -pqwerty 7za433_7zip_lzma_crypto.7z
+sure diff -r 7za433_ref 7za433_7zip_lzma_crypto
+
+sure ${P7ZIP} x 7za433_7zip_ppmd.7z
+sure diff -r 7za433_ref 7za433_7zip_ppmd
+
+sure ${P7ZIP} x 7za433_7zip_bzip2.7z
+sure diff -r 7za433_ref 7za433_7zip_bzip2
+
+echo ""
+echo "# EXTRACTING (LZMA) ..."
+echo "#######################"
+
+rm -f 7za.exe
+
+sure ${P7ZIP} x ../test/7za.exe.lzma
+sure diff 7za.exe 7za433_ref/bin/7za.exe
+sure rm -f 7za.exe
+
+sure ${P7ZIP} x ../test/7za.exe.lzma86
+sure diff 7za.exe 7za433_ref/bin/7za.exe
+sure rm -f 7za.exe
+
+sure ${P7ZIP} x ../test/7za.exe.lzma_eos
+sure diff 7za.exe 7za433_ref/bin/7za.exe
+sure rm -f 7za.exe
+
+
+echo ""
+echo "# TESTING (XZ) ..."
+echo "#######################"
+sure ${P7ZIP} x ../test/7za.exe.xz
+sure diff 7za.exe 7za433_ref/bin/7za.exe
+
+chmod +x 7za.exe
+sure ${P7ZIP} -txz a 7za.exe.xz 7za.exe
+sure rm -f 7za.exe
+
+sure ${P7ZIP} x 7za.exe.xz
+sure diff 7za.exe 7za433_ref/bin/7za.exe
+sure rm -f 7za.exe
+
+#####################################
+
+cd ..
+
+# ./clean_all.sh
+chmod -R 777 ${REP} 2> /dev/null
+rm -fr   ${REP}
+
+echo ""
+echo "==========="
+echo "ALL SUCCESS"
+echo "==========="
+echo ""
diff --git a/makefile.common b/makefile.common
index d8f6e1612..a25958391 100644
--- a/makefile.common
+++ b/makefile.common
@@ -98,7 +98,7 @@ clean_full:clean
 	chmod +x install.sh check/*.sh
 
 test: 7za sfx
-	cd check ; TOOLS="${TOOLS}" ./check.sh "`pwd`/../bin/7za"
+	cd check ; TOOLS="${TOOLS}" ./check_7za.sh "`pwd`/../bin/7za"
 
 test_7z: 7z sfx
 	cd check ; TOOLS="${TOOLS}" ./check.sh "`pwd`/../bin/7z"