diff --git a/src/clientdb.js b/src/clientdb.js
index ef3c7f9d5..3220a00ef 100644
--- a/src/clientdb.js
+++ b/src/clientdb.js
@@ -152,7 +152,7 @@ function delByAppIdAndType(appId, type, callback) {
 function clear(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('DELETE FROM clients WHERE appId!="webadmin"', function (error) {
+    database.query('DELETE FROM clients WHERE id!="cid-webadmin" AND id!="cid-sdk" AND id!="cid-cli"', function (error) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
         callback(null);
diff --git a/src/test/setupTest b/src/test/setupTest
index 2e63c2576..94c695b3e 100755
--- a/src/test/setupTest
+++ b/src/test/setupTest
@@ -19,6 +19,7 @@ openssl req -x509 -newkey rsa:2048 -keyout data/nginx/cert/host.key -out data/ng
 webadmin_scopes="cloudron,profile,users,apps,settings"
 webadmin_origin="https://${ADMIN_LOCATION}-localhost"
 
+# !!!!!! check clientdb.js clear() to not nuke those entries
 echo "Add webadmin api client"
 mysql --user=root --password="" \
     -e "REPLACE INTO clients (id, appId, type, clientSecret, redirectURI, scope) VALUES (\"cid-webadmin\", \"Settings\", \"external\", \"secret-webadmin\", \"${webadmin_origin}\", \"${webadmin_scopes}\")" boxtest