diff --git a/src/core/command/run.py b/src/core/command/run.py
index 46829806a219ddbb01924f1f3cdf13cea868bf3e..d47b2b279a3d46cf283d0fa419e6459e8d058856 100644
--- a/src/core/command/run.py
+++ b/src/core/command/run.py
@@ -227,6 +227,7 @@ class Run(object):
 
             scheduler = get_plugin(plugin_type=Plugin.SCHEDULER,
                                    plugin_id=SchedulerType.SCHEDULER)[0]
+            scheduler.update_test_type_in_source("OHRust", DeviceTestType.oh_rust_test)
             if scheduler is None:
                 LOG.error("Can not find the scheduler plugin.")
             else:
diff --git a/src/core/testcase/testcase_manager.py b/src/core/testcase/testcase_manager.py
index 1c47b4f3f7e849c47775041b492e008d1d59b704..e1f7fe109e02410044e61eb72540c095223efa8b 100644
--- a/src/core/testcase/testcase_manager.py
+++ b/src/core/testcase/testcase_manager.py
@@ -38,7 +38,8 @@ TESTFILE_TYPE_DATA_DIC = {
     "BIN": [],
     "OHJST": [],
     "JST": [],
-    "LTPPosix": []
+    "LTPPosix": [],
+    "OHRust": []
 }
 FILTER_SUFFIX_NAME_LIST = [".TOC", ".info", ".pyc"]
 
@@ -146,7 +147,10 @@ class TestCaseManager(object):
                         continue
                     suite_file_dictionary.get("PYT").append(suite_file)
                 elif suffix_name == "":
-                    suite_file_dictionary.get("CXX").append(suite_file)
+                    if file_name.find("rust") != -1:
+                        suite_file_dictionary.get("OHRust").append(suite_file)
+                    else:
+                        suite_file_dictionary.get("CXX").append(suite_file)
                 elif suffix_name == ".bin":
                     suite_file_dictionary.get("BIN").append(suite_file)