diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt
index 7fe4a546..4938e1b5 100644
--- a/scm/src/CMakeLists.txt
+++ b/scm/src/CMakeLists.txt
@@ -24,7 +24,7 @@ else()
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     set(_ccpp_suites_arg "--suites=${suite_string}")
-    message("Calling CCPP code generator (ccpp_prebuild.py) for SUPPORTED suites ${_ccpp_suites_arg} ...")
+    message("Calling CCPP code generator (ccpp_prebuild.py) for suites listed in scm/src/suite_info.py: ${_ccpp_suites_arg}.")
 endif()
 # Run CCPP prebuild.py
 message (STATUS "Running ccpp_prebuild.py for CCPP")
diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py
index 299ca4d6..494b5dff 100755
--- a/scm/src/suite_info.py
+++ b/scm/src/suite_info.py
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 
+import sys, os
+
+#DEFAULT_SUITE_BEHAVIOR = 'supported'
+DEFAULT_SUITE_BEHAVIOR = 'regression_test'
+
 class suite(object):
   
     DEFAULT_MAX_TIMESTEP = 1800.0
@@ -72,9 +77,34 @@ def main():
     
     #print supported suites separated by commas
     suite_string = ''
-    for s in suite_list:
-        if s._supported:
-            suite_string += s._name + ',' + s._name + '_ps' + ','  
+    
+    if DEFAULT_SUITE_BEHAVIOR == 'regression_test':
+        dir_path = os.path.dirname(os.path.realpath(__file__))
+        sys.path.insert(1, dir_path + '/../../test/')
+        
+        rt_suite_list = []
+        
+        import rt_test_cases
+        import rt_test_cases_sp
+        import rt_test_cases_nvidia
+        
+        for item in rt_test_cases.run_list:
+            rt_suite_list.append(item.get("suite"))
+        
+        for item in rt_test_cases_sp.run_list:
+            rt_suite_list.append(item.get("suite"))
+        
+        for item in rt_test_cases_nvidia.run_list:
+            rt_suite_list.append(item.get("suite"))
+        
+        unique_suite_list = list(set(rt_suite_list))
+        
+        for s in unique_suite_list:    
+            suite_string += s + ',' + s + '_ps' + ','
+    else:
+        for s in suite_list:
+            if s._supported:
+                suite_string += s._name + ',' + s._name + '_ps' + ','  
     print(suite_string[:-1])
 
 if __name__ == '__main__':