diff --git a/texlive.spec b/texlive.spec
index 77dbb85..28811e7 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -4299,10 +4299,6 @@ popd
 	    --with-xdvi-x-toolkit=xaw3d		\
 	    --with-editor='vi +%%d %%s'
 
-	PATH=$prefix/bin:$PATH			\
-	TEXMFLOCAL=%{_texmfmaindir}		\
-	TEXMFCNF=$texmfcnf			\
-    (
         testsuite () {
             test -s ${world}/bibtex-x/test-suite.log || return
             cat ${world}/bibtex-x/test-suite.log
@@ -4311,11 +4307,16 @@ popd
                 echo $log
                 cat $log
             done
+            rm -vf %{options}
         }
         trap "testsuite" ERR
 
+	PATH=$prefix/bin:$PATH			\
+	TEXMFLOCAL=%{_texmfmaindir}		\
+	TEXMFCNF=$texmfcnf			\
 	make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true
-    )
+
+        trap 'rm -vf %{options}' ERR
 
     popd