diff --git a/__init__.py b/addons/sale_coupon_delivery/__init__.py
similarity index 100%
rename from __init__.py
rename to addons/sale_coupon_delivery/__init__.py
diff --git a/__manifest__.py b/addons/sale_coupon_delivery/__manifest__.py
similarity index 100%
rename from __manifest__.py
rename to addons/sale_coupon_delivery/__manifest__.py
diff --git a/models/__init__.py b/addons/sale_coupon_delivery/models/__init__.py
similarity index 100%
rename from models/__init__.py
rename to addons/sale_coupon_delivery/models/__init__.py
diff --git a/models/sale_coupon.py b/addons/sale_coupon_delivery/models/sale_coupon.py
similarity index 100%
rename from models/sale_coupon.py
rename to addons/sale_coupon_delivery/models/sale_coupon.py
diff --git a/models/sale_coupon_program.py b/addons/sale_coupon_delivery/models/sale_coupon_program.py
similarity index 100%
rename from models/sale_coupon_program.py
rename to addons/sale_coupon_delivery/models/sale_coupon_program.py
diff --git a/models/sale_coupon_reward.py b/addons/sale_coupon_delivery/models/sale_coupon_reward.py
similarity index 100%
rename from models/sale_coupon_reward.py
rename to addons/sale_coupon_delivery/models/sale_coupon_reward.py
diff --git a/models/sale_order.py b/addons/sale_coupon_delivery/models/sale_order.py
similarity index 100%
rename from models/sale_order.py
rename to addons/sale_coupon_delivery/models/sale_order.py
diff --git a/tests/__init__.py b/addons/sale_coupon_delivery/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to addons/sale_coupon_delivery/tests/__init__.py
diff --git a/tests/test_free_shipping_reward.py b/addons/sale_coupon_delivery/tests/test_free_shipping_reward.py
similarity index 99%
rename from tests/test_free_shipping_reward.py
rename to addons/sale_coupon_delivery/tests/test_free_shipping_reward.py
index 1f9ba57afa6..a3bc762db9a 100644
--- a/tests/test_free_shipping_reward.py
+++ b/addons/sale_coupon_delivery/tests/test_free_shipping_reward.py
@@ -2,9 +2,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from openerp.addons.sale_coupon.tests.common import TestSaleCouponCommon
-from odoo.tests import Form
+from odoo.tests import Form, tagged
 
 
+@tagged('post_install', '-at_install')
 class TestSaleCouponProgramRules(TestSaleCouponCommon):
 
     def setUp(self):