diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp
index 2614e4d5..05e9f46b 100644
--- a/include/internal/catch_commandline.hpp
+++ b/include/internal/catch_commandline.hpp
@@ -49,7 +49,7 @@ namespace Catch {
         while( std::getline( f, line ) ) {
             line = trim(line);
             if( !line.empty() && !startsWith( line, "#" ) )
-                addTestOrTags( config, line );
+                addTestOrTags( config, "\"" + line + "\"" );
         }
     }
 
diff --git a/include/internal/catch_test_spec_parser.hpp b/include/internal/catch_test_spec_parser.hpp
index 6fc356e8..53c724b9 100644
--- a/include/internal/catch_test_spec_parser.hpp
+++ b/include/internal/catch_test_spec_parser.hpp
@@ -36,10 +36,10 @@ namespace Catch {
                 visitChar( m_arg[m_pos] );
             if( m_mode == Name )
                 addPattern<TestSpec::NamePattern>();
+            addFilter();
             return *this;
         }
         TestSpec testSpec() {
-            addFilter();
             return m_testSpec;
         }
     private: