diff --git a/build.gradle b/build.gradle
index 70b38bf..9076883 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,11 +163,13 @@ task testDataDictionary_1_7() {
           'html:' + certReportsDir + '/' + reportName + '.html',
           '--glue',
           'org.reso.certification.stepdefs#DataDictionary',
-          'src/main/java/org/reso/certification/features/data-dictionary/v1-7-0',
-          '--tags',
-          (systemProperties.get('cucumber.filter.tags', '').toString().trim().length() > 0
-              ? systemProperties.get('cucumber.filter.tags') : '')
+          'src/main/java/org/reso/certification/features/data-dictionary/v1-7-0'
       ]
+
+      if (systemProperties.hasProperty('cucumber.filter.tags')) {
+        args.add('--tags')
+        args.add(systemProperties.get('cucumber.filter.tags').toString())
+      }
     }
   }
 }