diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e621b36fbdd3938f38a009a71c8970d55b9fa6b_LmdpdGxhYi1jaS55bWw=..324e97070580f9bbe280a269c5f61069dcff3d37_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,28 @@
   script:
   - isort --check-only --diff
 
+import_jsonrpc_odoo11_test:
+  stage: test
+  image:
+    name: registry.xcg.io/odoo/odoo:11.0-bionic
+    entrypoint: [""]
+  services:
+  - name: postgres:11-alpine
+    command: ["-c", "fsync=off"]
+    alias: db
+  variables:
+    POSTGRES_USER: odoo
+    POSTGRES_PASSWORD: ""
+    POSTGRES_HOST_AUTH_METHOD: trust
+  before_script:
+  - pip3 install $CI_PROJECT_DIR --disable-pip-version-check --no-cache-dir
+  script:
+  - sudo -u odoo env ODOO_TYPE=odoo11 $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --without-demo=all --data-dir /var/lib/odoo --init base &
+  # wait for odoo to install the modules
+  - sleep 35
+  # then test the setup files
+  - import_jsonrpc -v --host localhost --password admin -d test_setup --protocol jsonrpc -p 8069 --directory tests/import
+
 docker:
   stage: build
   image: docker.orus.io/cc/docker
diff --git a/start b/start
index 1e621b36fbdd3938f38a009a71c8970d55b9fa6b_c3RhcnQ=..324e97070580f9bbe280a269c5f61069dcff3d37_c3RhcnQ= 100755
--- a/start
+++ b/start
@@ -15,7 +15,7 @@
     python="python2"
 fi
 # odoo7, odoo8, odoo10, odoo11 or bzr
-ODOO_TYPE=$($python -B -c "from six.moves import configparser ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(c.get('odoo_scripts', 'odoo_type') if c.has_option('odoo_scripts', 'odoo_type') else 'odoo8')")
+ODOO_TYPE=${ODOO_TYPE:-$($python -B -c "from six.moves import configparser ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(c.get('odoo_scripts', 'odoo_type') if c.has_option('odoo_scripts', 'odoo_type') else 'odoo8')")}
 
 load_language=$($python -B -c "from six.moves import configparser ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(c.get('odoo_scripts', 'load-language') if c.has_option('odoo_scripts', 'load-language') else '')")
 
@@ -19,7 +19,7 @@
 
 load_language=$($python -B -c "from six.moves import configparser ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(c.get('odoo_scripts', 'load-language') if c.has_option('odoo_scripts', 'load-language') else '')")
 
-echo "INFO - Starting odoo for development"
+echo "INFO - Starting odoo ($ODOO_TYPE) for development"
 
 #
 # Do some magic to find the odoo command to run
diff --git a/tests/import/1 res.currency.csv b/tests/import/1 res.currency.csv
new file mode 100644
index 0000000000000000000000000000000000000000..324e97070580f9bbe280a269c5f61069dcff3d37_dGVzdHMvaW1wb3J0LzEgcmVzLmN1cnJlbmN5LmNzdg==
--- /dev/null
+++ b/tests/import/1 res.currency.csv	
@@ -0,0 +1,4 @@
+id,active
+base.EUR,1
+base.GBP,1
+base.USD,1
diff --git a/tests/import/1 res.lang.csv b/tests/import/1 res.lang.csv
new file mode 100644
index 0000000000000000000000000000000000000000..324e97070580f9bbe280a269c5f61069dcff3d37_dGVzdHMvaW1wb3J0LzEgcmVzLmxhbmcuY3N2
--- /dev/null
+++ b/tests/import/1 res.lang.csv	
@@ -0,0 +1,3 @@
+id,active
+base.lang_en_GB,1
+base.lang_fr,1
diff --git a/tests/import/2 res.company.csv b/tests/import/2 res.company.csv
new file mode 100644
index 0000000000000000000000000000000000000000..324e97070580f9bbe280a269c5f61069dcff3d37_dGVzdHMvaW1wb3J0LzIgcmVzLmNvbXBhbnkuY3N2
--- /dev/null
+++ b/tests/import/2 res.company.csv	
@@ -0,0 +1,4 @@
+id,name,currency_id/id
+base.main_company,Import Test,base.EUR
+company_uk,UK Import Test,base.GBP
+company_us,US Import Test,base.USD
diff --git a/tests/import/2 res.company@fr_FR.csv b/tests/import/2 res.company@fr_FR.csv
new file mode 100644
index 0000000000000000000000000000000000000000..324e97070580f9bbe280a269c5f61069dcff3d37_dGVzdHMvaW1wb3J0LzIgcmVzLmNvbXBhbnlAZnJfRlIuY3N2
--- /dev/null
+++ b/tests/import/2 res.company@fr_FR.csv	
@@ -0,0 +1,4 @@
+id,name
+base.main_company,Test d’import
+company_uk,Test d’import RU
+company_us,Test d’import É.-U.
diff --git a/tests/import/3 res.users.csv b/tests/import/3 res.users.csv
new file mode 100644
index 0000000000000000000000000000000000000000..324e97070580f9bbe280a269c5f61069dcff3d37_dGVzdHMvaW1wb3J0LzMgcmVzLnVzZXJzLmNzdg==
--- /dev/null
+++ b/tests/import/3 res.users.csv	
@@ -0,0 +1,4 @@
+id,company_ids/id,lang
+base.user_root,"base.main_company,company_uk,company_us",fr_FR
+base.default_user,,fr_FR
+base.public_user,,en_GB