diff --git a/tests/yamlparser/job_fixtures/regression-2010428.inc.j2 b/tests/yamlparser/job_fixtures/regression-2010428.inc.j2
new file mode 100644
index 000000000..ae3ad3d98
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/regression-2010428.inc.j2
@@ -0,0 +1 @@
+some builder
diff --git a/tests/yamlparser/job_fixtures/regression-2010428.xml b/tests/yamlparser/job_fixtures/regression-2010428.xml
new file mode 100644
index 000000000..7a8ca9f04
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/regression-2010428.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<flow-definition plugin="workflow-job">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps">
+    <script>some builder</script>
+    <sandbox>false</sandbox>
+  </definition>
+  <actions/>
+  <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+  </properties>
+</flow-definition>
diff --git a/tests/yamlparser/job_fixtures/regression-2010428.yaml b/tests/yamlparser/job_fixtures/regression-2010428.yaml
new file mode 100644
index 000000000..86a261dab
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/regression-2010428.yaml
@@ -0,0 +1,8 @@
+# https://storyboard.openstack.org/#!/story/2010428
+# Bug: TypeError: argument of type 'Jinja2Loader' is not iterable
+
+- job:
+    name: test
+    project-type: pipeline
+
+    dsl: !include-jinja2: regression-2010428.inc.j2
diff --git a/tests/yamlparser/job_fixtures/regression-2010535.xml b/tests/yamlparser/job_fixtures/regression-2010535.xml
new file mode 100644
index 000000000..9bee35216
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/regression-2010535.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>PARAM_1</name>
+          <description/>
+          <defaultValue>{default|my_default}</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>PARAM_2</name>
+          <description/>
+          <defaultValue>my_default</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/tests/yamlparser/job_fixtures/regression-2010535.yaml b/tests/yamlparser/job_fixtures/regression-2010535.yaml
new file mode 100644
index 000000000..3694578b1
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/regression-2010535.yaml
@@ -0,0 +1,32 @@
+# https://storyboard.openstack.org/#!/story/2010535
+# Bug: JJB doesn't expand macro in case of usage without arguments
+# String templates in macro calls without parameters are NOT expanded.
+# Jinja2 templates in macro calls without parameters ARE expanded.
+
+- parameter:
+    name: p_PARAM_1
+    parameters:
+    - string:
+        name: PARAM_1
+        # Not expanded:
+        default: '{default|my_default}'
+
+- parameter:
+    name: p_PARAM_2
+    parameters:
+    - string:
+        name: PARAM_2
+        # Expanded to default value:
+        default: !j2: '{{ default | default("my_default") }}'
+
+# job definition
+- job-template:
+    name: sample-job
+    parameters:
+    - p_PARAM_1
+    - p_PARAM_2
+
+- project:
+    name: sample-project
+    jobs:
+    - sample-job