diff --git a/packages/common/karma.conf.js b/packages/common/karma.conf.js
index 6a646f5ec9ea5a6c50dd25dc6038dd94fff1bc43..4938aad60dd7a13331df5ea61ee105ffd1cfa081 100644
--- a/packages/common/karma.conf.js
+++ b/packages/common/karma.conf.js
@@ -4,7 +4,7 @@ process.env.CHROME_BIN = require('puppeteer').executablePath();
 module.exports = function(config) {
   config.set({
     basePath: 'dist',
-    frameworks: ['mocha', 'chai'],
+    frameworks: ['mocha'],
     files: [
       {pattern: './*.js', included: true, watched: true, served: true, type: 'module'},
       {pattern: './**/*', included: false, watched: true, served: true},
diff --git a/packages/common/package.json b/packages/common/package.json
index f7e7f2497c055029a3ae94e547a11cfb388a0e15..a35abfa59784c061aef8c4b4554431360e2f687a 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -5,7 +5,6 @@
   "devDependencies": {
     "chai": "^4.2.0",
     "karma": "^4.2.0",
-    "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.0.0",
     "karma-mocha": "^1.3.0",
     "mocha": "^6.2.0",
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index 91a6d227640d19f5575d74192fa291a408ec2243..445fc2926c9656f20c4bde94513111226ce6d22c 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/rollup.config.js
@@ -5,7 +5,9 @@ import multiEntry from 'rollup-plugin-multi-entry';
 import copy from 'rollup-plugin-copy';
 import serve from 'rollup-plugin-serve';
 import consts from 'rollup-plugin-consts';
+import del from 'rollup-plugin-delete';
 import json from 'rollup-plugin-json';
+import chai from 'chai';
 
 const pkg = require('./package.json');
 const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
@@ -17,7 +19,17 @@ export default {
         file: 'dist/bundle.js',
         format: 'esm'
     },
+    onwarn: function (warning, warn) {
+        // ignore chai warnings
+        if (warning.code === 'CIRCULAR_DEPENDENCY') {
+          return;
+        }
+        warn(warning);
+    },
     plugins: [
+        del({
+            targets: 'dist/*'
+          }),
         multiEntry(),
         consts({
             environment: build,
@@ -29,7 +41,10 @@ export default {
           }
         }),
         commonjs({
-            include: 'node_modules/**'
+            include: 'node_modules/**',
+            namedExports: {
+                'chai': Object.keys(chai),
+            }
         }),
         json(),
         copy({
diff --git a/packages/common/test/i18next.js b/packages/common/test/i18next.js
index d5b6512ba42ec0b1f9be8af3d9298bbecd7e51d8..7e0d49fd882aa36d63b7c90d1e943d18d12b726b 100644
--- a/packages/common/test/i18next.js
+++ b/packages/common/test/i18next.js
@@ -1,3 +1,4 @@
+import {assert} from 'chai';
 import * as i18next from '../i18next.js';
 
 describe('i18next', () => {
diff --git a/packages/common/test/unit.js b/packages/common/test/unit.js
index 0698b75e6501dddf25cbdc294f2eb4a786b8ab02..4b9b17ed98f7b349385e4315e0ccc4a56ea00dab 100644
--- a/packages/common/test/unit.js
+++ b/packages/common/test/unit.js
@@ -1,3 +1,4 @@
+import {expect, assert} from 'chai';
 import * as utils from '../utils';
 import * as styles from '../styles';
 import '../vpu-mini-spinner.js';