diff --git a/test/runTest/client/client.js b/test/runTest/client/client.js
index 34891725fd..ba8d811177 100644
--- a/test/runTest/client/client.js
+++ b/test/runTest/client/client.js
@@ -472,7 +472,9 @@ const app = new Vue({
             let ecVersion = test[version + 'Version'];
             let ecSource = test[version + 'Source'];
             if (ecVersion !== 'local') {
-                let distPath = ecSource === 'branch' ? 'branch/' + ecVersion : ecVersion;
+                let distPath = ecSource === 'PR'
+                    ? 'pr-' + ecVersion.replace(/^#/, '')
+                    : ecVersion;
                 searches.push('__ECDIST__=' + distPath);
             }
             if (test.useSVG) {
diff --git a/test/runTest/util.js b/test/runTest/util.js
index f573c7935e..751b6a1bb3 100644
--- a/test/runTest/util.js
+++ b/test/runTest/util.js
@@ -81,12 +81,6 @@ module.exports.prepareEChartsLib = function (source, version, useCNMirror) {
     const ecDownloadPath = `${versionFolder}/echarts.js`;
     const testLibPath = `${versionFolder}/${module.exports.getEChartsTestFileName()}`;
 
-    // Check if both files exist and are not empty
-    if (fs.existsSync(ecDownloadPath) && fs.existsSync(testLibPath) &&
-        fs.statSync(ecDownloadPath).size > 0 && fs.statSync(testLibPath).size > 0) {
-        return Promise.resolve();
-    }
-
     fse.ensureDirSync(versionFolder);
 
     if (!version || version === 'local') {
@@ -96,6 +90,10 @@ module.exports.prepareEChartsLib = function (source, version, useCNMirror) {
         fs.writeFileSync(testLibPath, code, 'utf-8');
         return Promise.resolve();
     }
+    else if (fs.existsSync(ecDownloadPath) && fs.existsSync(testLibPath) &&
+        fs.statSync(ecDownloadPath).size > 0 && fs.statSync(testLibPath).size > 0) {
+        return Promise.resolve();
+    }
 
     return new Promise((resolve, reject) => {
         let url;