diff --git a/scripts/find-apps.sh b/scripts/find-apps.sh
index 1f199269c..fabec239e 100755
--- a/scripts/find-apps.sh
+++ b/scripts/find-apps.sh
@@ -10,6 +10,9 @@ find_app() {
     find "${appdir}" -mindepth 1 -maxdepth 1 -type d
 }
 
+# append emqx application first
+echo 'emqx'
+
 find_app 'apps'
 if [ -f 'EMQX_ENTERPRISE' ]; then
     find_app 'lib-ee'
diff --git a/scripts/find-suites.sh b/scripts/find-suites.sh
index 66296b758..4a3dbe09c 100755
--- a/scripts/find-suites.sh
+++ b/scripts/find-suites.sh
@@ -8,6 +8,8 @@ set -euo pipefail
 # ensure dir
 cd -P -- "$(dirname -- "$0")/.."
 
-APPDIR="$1"
-
-find "${APPDIR}/test" -name "*_SUITE.erl" | tr -d '\r' | tr '\n' ','
+TESTDIR="test"
+if [ "$1" != "emqx" ]; then
+    TESTDIR="$1/test"
+fi
+find "${TESTDIR}" -name "*_SUITE.erl" | tr -d '\r' | tr '\n' ','