diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 740db8b1d060a7679504b532b81e72b421132f43..075a7ac5ce93e7b1922b2759547c5947e82fe994 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,35 +1,75 @@
 variables:
   BUILDOUT: tools/buildout.cfg
+  DB_NAME: $CI_PROJECT_NAME-$CI_JOB_ID
+  DB_USER: openerp
+  NAME_PRO: $CI_PROJECT_NAME
 
 cache:
-  key: "$CI_BUILD_NAME"
+  key: one-key-to-rule-them-all
   paths:
   - buildout-cache/
 
 before_script:
-  - git clone --depth=1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.openpyme.mx/pyerp/test.git tools
+  - git clone --depth=1 http://gitlab.openpyme.mx/pyerp/bench.git
+  - cd bench
+  - ls
+  - rm -r buildout.cfg
+  - ls
+  - cp $CI_PROJECT_DIR/buildout.cfg buildout.cfg
+  - ls
+  - ln -s profiles/testing.cfg local.cfg
   - virtualenv --quiet --python=python2.7 .
   - source bin/activate
-  - pip install -r tools/requirements.txt
+  - pip install -r requirements.txt
 
 stages:
   - build
-  - test
+  - unit_test
+  - code_style
   - deploy
 
+make:
+  tags:
+    - base
+  stage: build
+  script:
+    - buildout
+  artifacts:
+    paths:
+      - bin
+      - etc
+      - include
+      - lib
+      - parts
+      - var
+    expire_in: 1 week
+
+test:
+  tags:
+    - base
+  stage: unit_test
+  script:
+    - pwd
+    - buildout
+    - createdb $DB_NAME
+    - start_openerp -d $DB_NAME --stop-after-init -i $NAME_PRO
+    - green -d $DB_NAME -- parts/$NAME_PRO
+  dependencies:
+    - make
+
 code-analysis:
-  stage: test
+  stage: code_style
   script:
     - buildout -qc $BUILDOUT buildout:directory=$CI_PROJECT_DIR install node code-analysis
     - code-analysis
 
 lint-analysis:
-  stage: test
+  stage: code_style
   script:
     - buildout -qc $BUILDOUT buildout:directory=$CI_PROJECT_DIR install pylint-bin pylint
 
 mccabe:
-  stage: test
+  stage: code_style
   script:
     - buildout -qc $BUILDOUT buildout:directory=$CI_PROJECT_DIR install xenon
-    - xenon -bC -mB -aB -i bin,eggs,old-eggs,downloads,lib .
+    - xenon -bC -mB -aB -i bin,eggs,downloads,lib .
diff --git a/buildout.cfg b/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..c7fddf8db1e3b68e09c7150977b16bd051c0352c
--- /dev/null
+++ b/buildout.cfg
@@ -0,0 +1,57 @@
+[buildout]
+extends =
+    local.cfg
+    config/account.cfg
+    config/crm.cfg
+    config/ecommerce.cfg
+    config/elearning.cfg
+    config/field_service.cfg
+    config/hr.cfg
+    config/manufacturing.cfg
+    config/mexico.cfg
+    config/multicompany.cfg
+    config/payroll.cfg
+    config/pos.cfg
+    config/purchase.cfg
+    config/sale.cfg
+    config/stock.cfg
+    config/survey.cfg
+    config/suscription.cfg
+    floating_versions_project.cfg
+    pinned_versions_project.cfg
+
+
+# The project name, base for paths
+site = pyerp
+domain = subdomain.openpyme.mx
+
+# Adjust to directory-setup of server. (Usually don't needed)
+# Relative paths:
+filestore = ${buildout:directory}/data_dir
+
+eggs +=
+#    project.site
+
+test-eggs +=
+#    project.site [test]
+
+production-eggs +=
+#    project.site
+
+# The PyERP options
+[options]
+admin_passwd = 11235813
+xmlrpc_port = 8069
+longpolling_port = 8072
+db_maxconn = 64
+dbfilter = .*
+workers = 3
+limit_time_cpu = 86400
+limit_time_real = 86400
+limit_memory_soft = 2684354560
+limit_memory_hard = 3221225472
+sentry_dns = http://a49ee0cdb261441aa28990a5b909fc55:c079095e7aa84bebbd2027157de826a6@sentry.openpyme.mx/7
+
+[sources]
+# project.site = fs project.site full-path=${buildout:directory}/src/project.site
+# starzel_buildout = git git@github.com:starzel/buildout.git egg=False