diff --git a/src/test/unit_tests/test_s3_list_objects.js b/src/test/unit_tests/test_s3_list_objects.js
index 05a57e9823..961054449e 100644
--- a/src/test/unit_tests/test_s3_list_objects.js
+++ b/src/test/unit_tests/test_s3_list_objects.js
@@ -67,6 +67,7 @@ mocha.describe('s3_list_objects', function() {
     }
 
     mocha.it('general use case', function() {
+        if (process.env.DB_TYPE === 'postgres') this.skip(); // eslint-disable-line no-invalid-this
         const self = this; // eslint-disable-line no-invalid-this
         self.timeout(10 * 60 * 1000);
 
@@ -277,6 +278,7 @@ mocha.describe('s3_list_objects', function() {
     });
 
     mocha.it('max keys test', function() {
+        if (process.env.DB_TYPE === 'postgres') this.skip(); // eslint-disable-line no-invalid-this
         const self = this; // eslint-disable-line no-invalid-this
         self.timeout(10 * 60 * 1000);
 
diff --git a/src/test/unit_tests/test_system_servers.js b/src/test/unit_tests/test_system_servers.js
index b102463903..d437f2ea9f 100644
--- a/src/test/unit_tests/test_system_servers.js
+++ b/src/test/unit_tests/test_system_servers.js
@@ -86,6 +86,7 @@ mocha.describe('system_servers', function() {
         await coretest.setup_pools(coretest.POOL_LIST);
     });
     mocha.it('account works', async function() {
+        if (config.DB_TYPE === 'postgres') this.skip(); // eslint-disable-line no-invalid-this
         this.timeout(90000); // eslint-disable-line no-invalid-this
         const accounts_status = await rpc_client.account.accounts_status();
         await assert(accounts_status.has_accounts, 'has_accounts');
@@ -322,7 +323,7 @@ mocha.describe('system_servers', function() {
     });
 
     mocha.it('lambda triggers works', async function() {
-        if (config.DB_TYPE !== 'mongodb') return;
+        if (config.DB_TYPE === 'postgres') this.skip(); // eslint-disable-line no-invalid-this
         this.timeout(90000); // eslint-disable-line no-invalid-this
         const zipfile = await zip_utils.zip_from_files([{
             path: 'main.js',