diff --git a/procurement_auto_create_group/README.rst b/procurement_auto_create_group/README.rst
index 60802c2af..f745646dc 100644
--- a/procurement_auto_create_group/README.rst
+++ b/procurement_auto_create_group/README.rst
@@ -54,6 +54,7 @@ Credits
 Contributors
 ------------
 * Jordi Ballester <jordi.ballester@eficent.com>
+* Lois Rilo <lois.rilo@eficent.com>
 
 Maintainer
 ----------
diff --git a/procurement_auto_create_group/tests/__init__.py b/procurement_auto_create_group/tests/__init__.py
new file mode 100644
index 000000000..9750f9643
--- /dev/null
+++ b/procurement_auto_create_group/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# © 2017 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import test_auto_create
diff --git a/procurement_auto_create_group/tests/test_auto_create.py b/procurement_auto_create_group/tests/test_auto_create.py
new file mode 100644
index 000000000..a2ca6ec72
--- /dev/null
+++ b/procurement_auto_create_group/tests/test_auto_create.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# © 2017 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp.tests.common import TransactionCase
+
+
+class TestProcurementAutoCreateGroup(TransactionCase):
+    def setUp(self, *args, **kwargs):
+        super(TestProcurementAutoCreateGroup, self).setUp(*args, **kwargs)
+        self.po_model = self.env['procurement.order']
+        self.pr_model = self.env['procurement.rule']
+        self.product_12 = self.env.ref('product.product_product_12')
+
+        # Create rules:
+        self.no_auto_create = self.pr_model.create({
+            'name': 'rule without autocreate',
+            'auto_create_group': False,
+            'action': [],
+        })
+        self.auto_create = self.pr_model.create({
+            'name': 'rule with autocreate',
+            'auto_create_group': True,
+            'action': [],
+        })
+
+    def test_auto_create_group(self):
+        """Test auto creation of group."""
+        proc1 = self.po_model.create({
+            'name': 'proc01',
+            'product_id': self.product_12.id,
+            'product_qty': 1.0,
+            'product_uom': self.product_12.uom_id.id,
+            'rule_id': self.no_auto_create.id,
+        })
+        self.assertFalse(proc1.group_id,
+                         "Procurement Group should not have been assigned.")
+        proc2 = self.po_model.create({
+            'name': 'proc02',
+            'product_id': self.product_12.id,
+            'product_qty': 1.0,
+            'product_uom': self.product_12.uom_id.id,
+            'rule_id': self.auto_create.id,
+        })
+        self.assertTrue(proc2.group_id,
+                        "Procurement Group has not been assigned.")