diff --git a/changedetectionio/model/Watch.py b/changedetectionio/model/Watch.py
index 2e6d6f43..77c07497 100644
--- a/changedetectionio/model/Watch.py
+++ b/changedetectionio/model/Watch.py
@@ -479,7 +479,7 @@ class model(dict):
             return True
 
         for f in self.all_tags:
-            fname = re.sub(r'[\W_-]', '', f).lower().strip() + ".txt"
+            fname = "headers-"+re.sub(r'[\W_]', '', f).lower().strip() + ".txt"
             filepath = os.path.join(self.__datastore_path, fname)
             if os.path.isfile(filepath):
                 return True
@@ -499,7 +499,7 @@ class model(dict):
 
         # Or each by tag, as tagname.txt in the main datadir
         for f in self.all_tags:
-            fname = re.sub(r'[\W_-]', '', f).lower().strip() + ".txt"
+            fname = "headers-"+re.sub(r'[\W_]', '', f).lower().strip() + ".txt"
             filepath = os.path.join(self.__datastore_path, fname)
             try:
                 if os.path.isfile(filepath):
diff --git a/changedetectionio/templates/edit.html b/changedetectionio/templates/edit.html
index 1d7c757d..af5e699c 100644
--- a/changedetectionio/templates/edit.html
+++ b/changedetectionio/templates/edit.html
@@ -158,7 +158,7 @@ User-Agent: wonderbra 1.0") }}
                                 <strong>Alert! Extra headers file found and will be added to this watch!</strong>
                             {% else %}
                                 Headers can be read from a textfile <code>headers.txt</code> in your data-directory, or per-watch in the watch sub-directory of the main data directory.<br>
-                                Also supported is <code>tagname.txt</code> in your data-directory (all letters in tagname converted to lowercase)
+                                Also supported is <code>headers-<strong><i>tagname</i></strong>.txt</code> in your data-directory (all letters in tagname converted to lowercase, alphanumeric only)
                             {% endif %}
                         </div>
 
diff --git a/changedetectionio/tests/test_request.py b/changedetectionio/tests/test_request.py
index 4667b27f..feaed72a 100644
--- a/changedetectionio/tests/test_request.py
+++ b/changedetectionio/tests/test_request.py
@@ -2,7 +2,7 @@ import json
 import os
 import time
 from flask import url_for
-from . util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
+from . util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks, extract_UUID_from_client
 
 def test_setup(live_server):
     live_server_setup(live_server)
@@ -239,7 +239,7 @@ def test_method_in_request(client, live_server):
     assert b'Deleted' in res.data
 
 def test_headers_textfile_in_request(client, live_server):
-
+    #live_server_setup(live_server)
     # Add our URL to the import page
     test_url = url_for('test_headers', _external=True)
 
@@ -253,21 +253,13 @@ def test_headers_textfile_in_request(client, live_server):
 
     time.sleep(1)
 
-    res = client.post(
-        url_for("import_page"),
-        data={"urls": test_url},
-        follow_redirects=True
-    )
-    assert b"1 Imported" in res.data
-
-    time.sleep(3)
 
     # Add some headers to a request
     res = client.post(
         url_for("edit_page", uuid="first"),
         data={
               "url": test_url,
-              "tag": "",
+              "tag": "testtag",
               "fetch_backend": "html_requests",
               "headers": "xxx:ooo\ncool:yeah\r\n"},
         follow_redirects=True
@@ -275,14 +267,23 @@ def test_headers_textfile_in_request(client, live_server):
     assert b"Updated watch." in res.data
     wait_for_all_checks(client)
 
+    with open('test-datastore/headers-testtag.txt', 'w') as f:
+        f.write("tag-header: test")
 
     with open('test-datastore/headers.txt', 'w') as f:
         f.write("global-header: nice\r\nnext-global-header: nice")
 
+    with open('test-datastore/'+extract_UUID_from_client(client)+'/headers.txt', 'w') as f:
+        f.write("watch-header: nice")
+
     client.get(url_for("form_watch_checknow"), follow_redirects=True)
 
     # Give the thread time to pick it up
     wait_for_all_checks(client)
+    # Not needed anymore
+    os.unlink('test-datastore/headers.txt')
+    os.unlink('test-datastore/headers-testtag.txt')
+    os.unlink('test-datastore/'+extract_UUID_from_client(client)+'/headers.txt')
     # The service should echo back the request verb
     res = client.get(
         url_for("preview_page", uuid="first"),
@@ -292,7 +293,9 @@ def test_headers_textfile_in_request(client, live_server):
     assert b"Global-Header:nice" in res.data
     assert b"Next-Global-Header:nice" in res.data
     assert b"Xxx:ooo" in res.data
-    os.unlink('test-datastore/headers.txt')
+    assert b"Watch-Header:nice" in res.data
+    assert b"Tag-Header:test" in res.data
+
 
     #unlink headers.txt on start/stop
     res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)