diff --git a/src/database.js b/src/database.js
index fc14a05f4..2250fb44c 100644
--- a/src/database.js
+++ b/src/database.js
@@ -144,7 +144,7 @@ function exportToFile(file, callback) {
 
     // latest mysqldump enables column stats by default which is not present in MySQL 5.7 server
     // this option must not be set in production cloudrons which still use the old mysqldump
-    const disableColStats = (constants.TEST && process.env.DESKTOP_SESSION !== 'ubuntu') ? '--column-statistics=0' : '';
+    const disableColStats = (constants.TEST && require('fs').readFileSync('/etc/lsb-release', 'utf-8').includes('20.04')) ? '--column-statistics=0' : '';
 
     var cmd = `/usr/bin/mysqldump -h "${gDatabase.hostname}" -u root -p${gDatabase.password} ${disableColStats} --single-transaction --routines --triggers ${gDatabase.name} > "${file}"`;
 
diff --git a/src/test/database-test.js b/src/test/database-test.js
index ba44201f9..3d08231f4 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -1834,7 +1834,7 @@ describe('database', function () {
         });
 
         it('list mailboxes succeeds', function (done) {
-            mailboxdb.listMailboxes(DOMAIN_0.domain, 1, 10, function (error, mailboxes) {
+            mailboxdb.listMailboxes(DOMAIN_0.domain, null /* search */, 1, 10, function (error, mailboxes) {
                 expect(error).to.be(null);
                 expect(mailboxes.length).to.be(2);
                 expect(mailboxes[0].name).to.be('girish');
diff --git a/src/test/dockerproxy-test.js b/src/test/dockerproxy-test.js
index 44252d9b9..dd836b48d 100644
--- a/src/test/dockerproxy-test.js
+++ b/src/test/dockerproxy-test.js
@@ -21,7 +21,7 @@ describe('Dockerproxy', function () {
         dockerProxy.start(function (error) {
             expect(error).to.not.be.ok();
 
-            exec(`${DOCKER} run -d cloudron/base:1.0.0 "bin/bash" "-c" "while true; do echo 'perpetual walrus'; sleep 1; done"`, function (error, stdout, stderr) {
+            exec(`${DOCKER} run -d cloudron/base:2.0.0 "bin/bash" "-c" "while true; do echo 'perpetual walrus'; sleep 1; done"`, function (error, stdout, stderr) {
                 expect(error).to.be(null);
                 expect(stderr).to.be.empty();
 
@@ -45,7 +45,7 @@ describe('Dockerproxy', function () {
     // it('wait', function (done) {} );
 
     it('can get info', function (done) {
-        exec(DOCKER + ' info', function (error, stdout, stderr) {
+        exec(DOCKER + ' info', function (error, stdout/*, stderr*/) {
             expect(error).to.be(null);
             expect(stdout).to.contain('Containers:');
             // expect(stderr).to.be.empty(); // on some machines, i get 'No swap limit support'
@@ -54,7 +54,7 @@ describe('Dockerproxy', function () {
     });
 
     it('can create container', function (done) {
-        var cmd = `${DOCKER} run cloudron/base:1.0.0 "/bin/bash" "-c" "echo 'hello'"`;
+        var cmd = `${DOCKER} run cloudron/base:2.0.0 "/bin/bash" "-c" "echo 'hello'"`;
         exec(cmd, function (error, stdout, stderr) {
             expect(error).to.be(null);
             expect(stdout).to.contain('hello');
@@ -64,7 +64,7 @@ describe('Dockerproxy', function () {
     });
 
     it('proxy overwrites the container network option', function (done) {
-        var cmd = `${DOCKER} run --network ifnotrewritethiswouldfail cloudron/base:1.0.0 "/bin/bash" "-c" "echo 'hello'"`;
+        var cmd = `${DOCKER} run --network ifnotrewritethiswouldfail cloudron/base:2.0.0 "/bin/bash" "-c" "echo 'hello'"`;
         exec(cmd, function (error, stdout, stderr) {
             expect(error).to.be(null);
             expect(stdout).to.contain('hello');