diff --git a/shell/hush_test/hush-misc/heredoc2.right b/shell/ash_test/ash-heredoc/heredoc5.right
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc2.right
rename to shell/ash_test/ash-heredoc/heredoc5.right
diff --git a/shell/hush_test/hush-misc/heredoc2.tests b/shell/ash_test/ash-heredoc/heredoc5.tests
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc2.tests
rename to shell/ash_test/ash-heredoc/heredoc5.tests
diff --git a/shell/hush_test/hush-misc/heredoc1.right b/shell/hush_test/hush-heredoc/heredoc1.right
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc1.right
rename to shell/hush_test/hush-heredoc/heredoc1.right
diff --git a/shell/hush_test/hush-misc/heredoc1.tests b/shell/hush_test/hush-heredoc/heredoc1.tests
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc1.tests
rename to shell/hush_test/hush-heredoc/heredoc1.tests
diff --git a/shell/hush_test/hush-heredoc/heredoc2.right b/shell/hush_test/hush-heredoc/heredoc2.right
new file mode 100644
index 000000000..a486f1ac4
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc2.right
@@ -0,0 +1,2 @@
+bar
+bar
diff --git a/shell/hush_test/hush-heredoc/heredoc2.tests b/shell/hush_test/hush-heredoc/heredoc2.tests
new file mode 100755
index 000000000..6d9ccb6cc
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc2.tests
@@ -0,0 +1,7 @@
+foo () {
+cat <<EOF && { echo "$1" ; }
+$1
+EOF
+}
+
+foo "bar"
diff --git a/shell/hush_test/hush-misc/heredoc3.right b/shell/hush_test/hush-heredoc/heredoc3.right
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc3.right
rename to shell/hush_test/hush-heredoc/heredoc3.right
diff --git a/shell/hush_test/hush-misc/heredoc3.tests b/shell/hush_test/hush-heredoc/heredoc3.tests
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc3.tests
rename to shell/hush_test/hush-heredoc/heredoc3.tests
diff --git a/shell/hush_test/hush-misc/heredoc4.right b/shell/hush_test/hush-heredoc/heredoc4.right
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc4.right
rename to shell/hush_test/hush-heredoc/heredoc4.right
diff --git a/shell/hush_test/hush-misc/heredoc4.tests b/shell/hush_test/hush-heredoc/heredoc4.tests
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc4.tests
rename to shell/hush_test/hush-heredoc/heredoc4.tests
diff --git a/shell/hush_test/hush-heredoc/heredoc5.right b/shell/hush_test/hush-heredoc/heredoc5.right
new file mode 100644
index 000000000..74110e3b5
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc5.right
@@ -0,0 +1,9 @@
+exit EOF-f
+"
+echo 1
+echo Hello World
+moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc5.tests b/shell/hush_test/hush-heredoc/heredoc5.tests
new file mode 100755
index 000000000..e619bded1
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc5.tests
@@ -0,0 +1,12 @@
+f=1
+  cat <<- EOF-f
+		exit EOF-f
+"
+echo $f
+echo `echo Hello World`
+		moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+EOF-f
+echo Ok
diff --git a/shell/hush_test/hush-misc/heredoc_backslash1.right b/shell/hush_test/hush-heredoc/heredoc_backslash1.right
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc_backslash1.right
rename to shell/hush_test/hush-heredoc/heredoc_backslash1.right
diff --git a/shell/hush_test/hush-misc/heredoc_backslash1.tests b/shell/hush_test/hush-heredoc/heredoc_backslash1.tests
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc_backslash1.tests
rename to shell/hush_test/hush-heredoc/heredoc_backslash1.tests
diff --git a/shell/hush_test/hush-misc/heredoc_huge.right b/shell/hush_test/hush-heredoc/heredoc_huge.right
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc_huge.right
rename to shell/hush_test/hush-heredoc/heredoc_huge.right
diff --git a/shell/hush_test/hush-misc/heredoc_huge.tests b/shell/hush_test/hush-heredoc/heredoc_huge.tests
similarity index 100%
rename from shell/hush_test/hush-misc/heredoc_huge.tests
rename to shell/hush_test/hush-heredoc/heredoc_huge.tests