diff --git a/tests/test-template-map.t b/tests/test-template-map.t
--- a/tests/test-template-map.t
+++ b/tests/test-template-map.t
@@ -133,6 +133,14 @@
   (available styles: bisect, changelog, compact, default, phases, show, status, xml)
   [255]
 
+Test map inheritance with directory as base
+
+  $ mkdir somedir
+  $ echo "__base__ = somedir" > map-base-dir
+  $ hg log -l1 -T./map-base-dir
+  abort: Is a directory: '$TESTTMP/a/somedir'
+  [255]
+
 Test including a built-in template map
 
   $ cat <<'EOF' > map-include-builtin
@@ -155,6 +163,17 @@
   $ hg log -l1 -T./map-include-nonexistent
   test
 
+Test including a directory as template map
+BROKEN: This should probably be an error just like the bad __base__ above
+
+  $ cat <<'EOF' > map-include-dir
+  > %include somedir
+  > [templates]
+  > changeset = "test\n"
+  > EOF
+  $ hg log -l1 -T./map-include-dir
+  test
+
 Test docheader, docfooter and separator in template map
 
   $ cat <<'EOF' > map-myjson
@@ -1251,6 +1270,10 @@
   (available styles: bisect, changelog, compact, default, phases, show, status, xml)
   [255]
 
+  $ hg log --style somedir
+  abort: Is a directory: 'somedir'
+  [255]
+
   $ hg log -T list
   available styles: bisect, changelog, compact, default, phases, show, status, xml
   abort: specify a template