diff --git a/setup/package.py b/setup/package.py
index 7f90c5cea9c..7040f38824f 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -370,36 +370,36 @@ def main():
     try:
         if not o.no_tarball:
             build_tgz(o)
-            if not o.no_testing:
-                try:
+            try:
+                if not o.no_testing:
                     test_tgz(o)
-                    publish(o, 'odoo.tar.gz')
-                except Exception, e:
-                    print("Won't publish the tgz release.\n Exception: %s" % str(e))
+                publish(o, 'odoo.tar.gz')
+            except Exception, e:
+                print("Won't publish the tgz release.\n Exception: %s" % str(e))
         if not o.no_debian:
             build_deb(o)
-            if not o.no_testing:
-                try:
+            try:
+                if not o.no_testing:
                     test_deb(o)
-                    publish(o, ['odoo.deb', 'odoo.dsc', 'odoo_amd64.changes', 'odoo.deb.tar.gz'])
-                except Exception, e:
-                    print("Won't publish the deb release.\n Exception: %s" % str(e))
+                publish(o, ['odoo.deb', 'odoo.dsc', 'odoo_amd64.changes', 'odoo.deb.tar.gz'])
+            except Exception, e:
+                print("Won't publish the deb release.\n Exception: %s" % str(e))
         if not o.no_rpm:
             build_rpm(o)
-            if not o.no_testing:
-                try:
+            try:
+                if not o.no_testing:
                     test_rpm(o)
-                    publish(o, ['odoo.noarch.rpm', 'odoo.src.rpm'])
-                except Exception, e:
-                    print("Won't publish the rpm release.\n Exception: %s" % str(e))
+                publish(o, ['odoo.noarch.rpm', 'odoo.src.rpm'])
+            except Exception, e:
+                print("Won't publish the rpm release.\n Exception: %s" % str(e))
         if not o.no_windows:
             build_exe(o)
-            if not o.no_testing:
-                try:
+            try:
+                if not o.no_testing:
                     test_exe(o)
-                    publish(o, 'odoo.exe')
-                except Exception, e:
-                    print("Won't publish the exe release.\n Exception: %s" % str(e))
+                publish(o, 'odoo.exe')
+            except Exception, e:
+                print("Won't publish the exe release.\n Exception: %s" % str(e))
     except:
         pass
     finally: