diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t
--- a/tests/test-commit-interactive.t
+++ b/tests/test-commit-interactive.t
@@ -338,7 +338,7 @@ Modify end of plain file, no EOL
 
 Record showfunc should preserve function across sections
 
-  $ cat > f1.py <<EOF
+  $ cat > f1.py <<NO_CHECK_EOF
   > def annotate(ui, repo, *pats, **opts):
   >     """show changeset information by line for each file
   > 
@@ -372,10 +372,10 @@ Record showfunc should preserve function
   >     .. container:: verbose
   > 
   >     Valid types are:
-  > EOF
+  > NO_CHECK_EOF
   $ hg add f1.py
   $ hg commit -m funcs
-  $ cat > f1.py <<EOF
+  $ cat > f1.py <<NO_CHECK_EOF
   > def annotate(ui, repo, *pats, **opts):
   >     """show changeset information by line for each file
   > 
@@ -405,7 +405,7 @@ Record showfunc should preserve function
   >     .. container:: verbose
   > 
   >     Valid types are:
-  > EOF
+  > NO_CHECK_EOF
   $ hg commit -i -m interactive <<EOF
   > y
   > y
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -1251,9 +1251,9 @@ Broken disabled extension and command:
 
   $ mkdir hgext
   $ echo > hgext/__init__.py
-  $ cat > hgext/broken.py <<EOF
+  $ cat > hgext/broken.py <<NO_CHECK_EOF
   > "broken extension'
-  > EOF
+  > NO_CHECK_EOF
   $ cat > path.py <<EOF
   > import os, sys
   > sys.path.insert(0, os.environ['HGEXTPATH'])
diff --git a/tests/test-hghave.t b/tests/test-hghave.t
--- a/tests/test-hghave.t
+++ b/tests/test-hghave.t
@@ -35,9 +35,9 @@ Testing hghave extensibility for third p
 (terminate with exit code 2 at failure of importing hghaveaddon.py)
 
   $ rm hghaveaddon.*
-  $ cat > hghaveaddon.py <<EOF
+  $ cat > hghaveaddon.py <<NO_CHECK_EOF
   > importing this file should cause syntax error
-  > EOF
+  > NO_CHECK_EOF
 
   $ hghave custom
   failed to import hghaveaddon.py from '.': invalid syntax (hghaveaddon.py, line 1)
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -456,9 +456,9 @@ preoutgoing hook can prevent outgoing ch
   >     unreachable = 1
   > EOF
 
-  $ cat > syntaxerror.py << EOF
+  $ cat > syntaxerror.py << NO_CHECK_EOF
   > (foo
-  > EOF
+  > NO_CHECK_EOF
 
 test python hooks