diff --git a/test/ci_support/cdash_analyze_and_report_random_failures_UnitTests.py b/test/ci_support/cdash_analyze_and_report_random_failures_UnitTests.py
index 66d4a96a4..7906f14a3 100644
--- a/test/ci_support/cdash_analyze_and_report_random_failures_UnitTests.py
+++ b/test/ci_support/cdash_analyze_and_report_random_failures_UnitTests.py
@@ -155,6 +155,7 @@ def cdash_analyze_and_report_random_failures_run_case(
             + "/cdash_analyze_and_report_random_failures.py"
             + " --cdash-project-name='Project Name'"
             + " --group-name='Group Name'"
+            + " --initial-nonpassing-test-filters='initial_nonpassing_test_filters'"
             + " --cdash-site-url='https://something.com/cdash'"
             + " --reference-date=2018-10-28"
             + " --write-email-to-file="+htmlFileName
@@ -232,7 +233,7 @@ def test_rft_1_ift_2(self):
                 "<h2>Random test failure scan results for Project Name from 2018-10-26 to 2018-10-28</h2>",
 
                 "<p>",
-                "<a href=\"https://something[.]com/cdash/queryTests[.]php[?]project=Project%20Name&begin=2018-10-26&end=2018-10-28&filtercount=2&showfilters=1&filtercombine=and&field1=status&compare1=63&value1=Failed&field2=groupname&compare2=63&value2=Pull%20Request\">Nonpassing tests scanned on CDash</a>=2<br>",
+                "<a href=\"https://something[.]com/cdash/queryTests[.]php[?]project=Project%20Name&begin=2018-10-26&end=2018-10-28&initial_nonpassing_test_filters\">Nonpassing tests scanned on CDash</a>=2<br>",
                 "</p",
 
                 "<p>",
@@ -270,7 +271,7 @@ def test_rft_0_ift_2(self):
                 "<h2>Random test failure scan results for Project Name from 2018-10-26 to 2018-10-28</h2>",
 
                 "<p>",
-                "<a href=\"https://something[.]com/cdash/queryTests[.]php[?]project=Project%20Name&begin=2018-10-26&end=2018-10-28&filtercount=2&showfilters=1&filtercombine=and&field1=status&compare1=63&value1=Failed&field2=groupname&compare2=63&value2=Pull%20Request\">Nonpassing tests scanned on CDash</a>=2<br>",
+                "<a href=\"https://something[.]com/cdash/queryTests[.]php[?]project=Project%20Name&begin=2018-10-26&end=2018-10-28&initial_nonpassing_test_filters\">Nonpassing tests scanned on CDash</a>=2<br>",
                 "</p>",
 
                 "<p>",
diff --git a/tribits/ci_support/cdash_analyze_and_report_random_failures.py b/tribits/ci_support/cdash_analyze_and_report_random_failures.py
index c2008d5c7..524803fe4 100755
--- a/tribits/ci_support/cdash_analyze_and_report_random_failures.py
+++ b/tribits/ci_support/cdash_analyze_and_report_random_failures.py
@@ -63,6 +63,7 @@ def main():
   # driver script or command line input
   cdashSiteUrl = args.cdash_site_url
   cdashProjectName = args.cdash_project_name
+  cdashInitialNonpassingTestFilters = args.initial_nonpassing_test_filters
   date = args.reference_date
   groupName = args.group_name
   daysOfHistory = args.days_of_history
@@ -73,14 +74,6 @@ def main():
 
   randomFailureSummaries = []
 
-  cdashInitialNonpassedTestsFilters = \
-    "filtercount=2&showfilters=1&filtercombine=and"+\
-    "&field1=status&compare1=63&value1=Failed"+\
-    "&field2=groupname&compare2=63&value2=Pull%20Request"
-  # TODO: This cdashNonpassedTestsFilters should be moved outside
-  # and into a project-specific driver script or taken as a
-  # command line input.
-
   # A.1) Set up date range and directories
 
   # Construct date range for queryTests filter string
@@ -99,7 +92,7 @@ def main():
 
   # Construct queryTest.php filter for a date range
   initialNonpassingTestQueryFilters = \
-    dateUrlField+"&"+cdashInitialNonpassedTestsFilters
+    dateUrlField+"&"+cdashInitialNonpassingTestFilters
 
   # A.2) Create starting email body and html string aggregation var
 
@@ -302,6 +295,7 @@ def getCmndLineArgs():
   parser = argparse.ArgumentParser("Arguments for cdash_analyze_and_report_random_failures.py")
   parser.add_argument("--cdash-site-url", default="", required=True)
   parser.add_argument("--cdash-project-name", default="", required=True)
+  parser.add_argument("--initial-nonpassing-test-filters", default="", required=True)
   parser.add_argument("--reference-date", default="yesterday")
   parser.add_argument("--group-name", default="Pull Request")
   parser.add_argument("--days-of-history", default=1, type=int)