non-standard options removed
diff --git a/asn1c/check-parsing.sh b/asn1c/check-parsing.sh
index 730c1fe..d4de339 100755
--- a/asn1c/check-parsing.sh
+++ b/asn1c/check-parsing.sh
@@ -13,7 +13,7 @@
     echo "Error while processing $PROCESSING"
 }
 
-trap print_status ERR
+trap print_status EXIT
 
 if [ "x${top_srcdir}" = "x" ]; then
   top_srcdir=".."
@@ -40,4 +40,8 @@
 	fi
 done
 
+if [ $ec = 0 ]; then
+    trap '' EXIT
+fi
+
 exit $ec
diff --git a/asn1c/tests/check-assembly.sh b/asn1c/tests/check-assembly.sh
index bdcc7d9..82245f0 100755
--- a/asn1c/tests/check-assembly.sh
+++ b/asn1c/tests/check-assembly.sh
@@ -10,7 +10,6 @@
 	exit
 fi
 
-set -o pipefail
 set -e
 
 # Compute the .asn1 spec name by the given file name.