diff --git a/tribits/ci_support/TribitsGetExtraReposForCheckinTest.cmake b/tribits/ci_support/TribitsGetExtraReposForCheckinTest.cmake
index 8ffa43e1e..fc172db54 100644
--- a/tribits/ci_support/TribitsGetExtraReposForCheckinTest.cmake
+++ b/tribits/ci_support/TribitsGetExtraReposForCheckinTest.cmake
@@ -109,19 +109,24 @@ SET(EXTRA_REPOS_PYTHON_STRING)
 APPEND_STRING_VAR_EXT(EXTRA_REPOS_PYTHON_STRING
   "[\n")
 
+IF ("${${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES}"  STREQUAL "")
+  SET(${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES
+    ${${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES_DEFAULT})
+ENDIF()
+
 SET(EXTRAREPO_IDX 0)
-FOREACH(EXTRAREPO_NAME ${${PROJECT_NAME}_EXTRA_REPOSITORIES})
+FOREACH(EXTRAREPO_NAME ${${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES})
 
   # Extract the data for current extra repo
-  LIST(GET ${PROJECT_NAME}_EXTRA_REPOSITORIES_DIRS ${EXTRAREPO_IDX}
+  LIST(GET ${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES_DIRS ${EXTRAREPO_IDX}
     EXTRAREPO_DIR )
-  LIST(GET ${PROJECT_NAME}_EXTRA_REPOSITORIES_REPOTYPES ${EXTRAREPO_IDX}
+  LIST(GET ${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES_REPOTYPES ${EXTRAREPO_IDX}
     EXTRAREPO_REPOTYPE )
-  LIST(GET ${PROJECT_NAME}_EXTRA_REPOSITORIES_REPOURLS ${EXTRAREPO_IDX}
+  LIST(GET ${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES_REPOURLS ${EXTRAREPO_IDX}
     EXTRAREPO_REPOURL )
-  LIST(GET ${PROJECT_NAME}_EXTRA_REPOSITORIES_PACKSTATS ${EXTRAREPO_IDX}
+  LIST(GET ${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES_PACKSTATS ${EXTRAREPO_IDX}
     EXTRAREPO_PACKSTAT )
-  LIST(GET ${PROJECT_NAME}_EXTRA_REPOSITORIES_CATEGORIES ${EXTRAREPO_IDX}
+  LIST(GET ${PROJECT_NAME}_ALL_EXTRA_REPOSITORIES_CATEGORIES ${EXTRAREPO_IDX}
     EXTRAREPO_CATEGORY )
 
   # Write the dictorary entries for this extra rep