diff --git a/test/issues/macro-scope/calling.jedi b/test/issues/macro-scope/calling.jedi
new file mode 100644
index 0000000..ee9cd54
--- /dev/null
+++ b/test/issues/macro-scope/calling.jedi
@@ -0,0 +1 @@
+div.test1 = 'calling'
diff --git a/test/issues/macro-scope/macros.jedi b/test/issues/macro-scope/macros.jedi
new file mode 100644
index 0000000..a7aee37
--- /dev/null
+++ b/test/issues/macro-scope/macros.jedi
@@ -0,0 +1,4 @@
+::div.test of x
+	'['
+	= x
+	']'
diff --git a/test/issues/macro-scope/simple/index.jedi b/test/issues/macro-scope/simple/index.jedi
new file mode 100644
index 0000000..3faba32
--- /dev/null
+++ b/test/issues/macro-scope/simple/index.jedi
@@ -0,0 +1,3 @@
+:import skeleton
+	#main::before
+		div = 'test'
diff --git a/test/issues/macro-scope/simple/macros.jedi b/test/issues/macro-scope/simple/macros.jedi
new file mode 100644
index 0000000..ba6319a
--- /dev/null
+++ b/test/issues/macro-scope/simple/macros.jedi
@@ -0,0 +1,2 @@
+:: div of msg
+	"(\(msg))"
diff --git a/test/issues/macro-scope/simple/skeleton.jedi b/test/issues/macro-scope/simple/skeleton.jedi
new file mode 100644
index 0000000..3342b36
--- /dev/null
+++ b/test/issues/macro-scope/simple/skeleton.jedi
@@ -0,0 +1,6 @@
+:import macros
+
+body
+	:let x = 1
+	#main
+		'Hello world!'
diff --git a/test/issues/macro-scope/skeleton.jedi b/test/issues/macro-scope/skeleton.jedi
new file mode 100644
index 0000000..3a7f360
--- /dev/null
+++ b/test/issues/macro-scope/skeleton.jedi
@@ -0,0 +1,9 @@
+:import macros
+
+
+html
+	:let x = 1
+	body
+
+		#frag
+			'origin'
diff --git a/test/issues/macro-scope/test.jedi b/test/issues/macro-scope/test.jedi
new file mode 100644
index 0000000..cc659b8
--- /dev/null
+++ b/test/issues/macro-scope/test.jedi
@@ -0,0 +1,14 @@
+:import skeleton
+
+	#frag
+		:for i in [1, 2, 3]
+			= i
+			:import calling
+
+	-- #frag::before
+		div
+			div.test = 'before'
+
+	-- #frag::after
+		div
+			div.test = 'after'