diff --git a/fluentd/files/filter/concat.conf b/fluentd/files/filter/concat.conf
new file mode 100644
index 0000000..05a8bac
--- /dev/null
+++ b/fluentd/files/filter/concat.conf
@@ -0,0 +1,41 @@
+<filter {{ values.tag }}>
+  @type concat
+  key {{ values.key }}
+  separator "{{ values.get('separator', '\\n') }}"
+  use_first_timestamp {{ values.get('use_first_timestmap', false) | lower }}
+  keep_partial_key {{ values.get('keep_partial_key', false) | lower }}
+{%- if values.get('n_lines', 0) %}
+  n_lines {{ values.n_lines | int }}
+{%- else %}
+  {%- if values.get('multiline_start_regexp', '') %}
+  multiline_start_regexp {{ values.multiline_start_regexp }}
+  {%- endif %}
+  {%- if values.get('multiline_end_regexp', '') %}
+  multiline_end_regexp {{ values.multiline_end_regexp }}
+  {%- endif %}
+  {%- if values.get('continuous_line_regexp', '') %}
+  continuous_line_regexp {{ values.continuous_line_regexp }}
+  {%- endif %}
+{%- endif %}
+{%- if values.get('stream_identity_key', '') %}
+  stream_identity_key {{ values.stream_identity_key }}
+{%- endif %}
+{%- if values.get('flush_interval') %}
+  flush_interval {{ values.flush_interval | int }}
+{%- endif %}
+{%- if values.get('timeout_label', '') %}
+  timeout_label {{ values.timeout_label }}
+{%- endif %}
+{%- if values.get('partial_key', '') %}
+  partial_key {{ values.partial_key }}
+{%- endif %}
+{%- if values.get('partial_value', '') %}
+  partial_value {{ values.partial_value }}
+{%- endif %}
+{%- if not values.get('use_partial_metadata') is none %}
+  use_partial_metadata {{ values.use_partial_metadata | lower }}
+{%- endif %}
+{%- if not values.get('keep_partial_metadata') is none %}
+  use_partial_metadata {{ values.keep_partial_metadata | lower }}
+{%- endif %}
+</filter>
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 25e5125..9ef0cbd 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -40,7 +40,7 @@
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
     python -m pip install salt${PIP_SALT_VERSION}
-    python -m pip install reno
+    python -m pip install reno 'msgpack<1' 'setuptools<45'
 }
 
 setup_mock_bin() {