diff --git a/test/Makefile.sources b/test/Makefile.sources
index 0fc7c52f6..33d6e81af 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -25,6 +25,7 @@ test_sources = \
 	big-trap.c					\
 	bilevel-image.c					\
 	bug-40410.c					\
+	bug-361.c					\
 	bug-448.c					\
 	bug-51910.c					\
 	bug-75705.c					\
diff --git a/test/bug-361.c b/test/bug-361.c
new file mode 100644
index 000000000..a0499223e
--- /dev/null
+++ b/test/bug-361.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2019 Uli Schlachter
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "cairo-test.h"
+
+/* This is basically gears.shape.arrow */
+static void
+shape (cairo_t *cr, double width, double height)
+{
+    double shaft_length = height / 2;
+    double shaft_width = width / 2;
+    double head_width = width;
+    double head_length = height - shaft_length;
+
+    cairo_move_to (cr, width / 2, 0);
+    cairo_rel_line_to (cr, head_width / 2, head_length);
+    cairo_rel_line_to (cr, -(head_width - shaft_width) / 2, 0);
+    cairo_rel_line_to (cr, 0, shaft_length);
+    cairo_rel_line_to (cr, -shaft_width, 0);
+    cairo_rel_line_to (cr, 0, -shaft_length);
+    cairo_rel_line_to (cr, -(head_width - shaft_width) / 2, 0);
+    cairo_close_path (cr);
+}
+
+/* This is basically the drawing routine of wibox.container.background */
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    double bw = 1.5;
+
+    cairo_push_group_with_content (cr, CAIRO_CONTENT_COLOR_ALPHA);
+
+    /* Draw background */
+    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_paint (cr);
+
+    /* Create shape */
+    cairo_translate (cr, bw, bw);
+    shape (cr, width - 2 * bw, height - 2 * bw);
+    cairo_translate (cr, -bw, -bw);
+
+    /* Now do the border */
+
+    cairo_push_group_with_content (cr, CAIRO_CONTENT_ALPHA);
+
+    /* Mark everything as "is border" */
+    cairo_set_source_rgba (cr, 0, 0, 0, 1);
+    cairo_paint (cr);
+
+    /* Remove inside of the shape */
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_source_rgba (cr, 0, 0, 0, 0);
+    cairo_fill_preserve (cr);
+
+    cairo_pattern_t *mask = cairo_pop_group (cr);
+
+    /* Now actually draw the border via the mask */
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_mask (cr, mask);
+
+    cairo_pattern_destroy (mask);
+
+    /* We now have the right content in a temporary surface. Copy it to the
+     * target surface. Needs another mask.
+     */
+    cairo_push_group_with_content (cr, CAIRO_CONTENT_ALPHA);
+
+    cairo_set_line_width (cr, 2 * bw);
+    cairo_set_source_rgba (cr, 0, 0, 0, 1);
+    cairo_stroke_preserve (cr);
+    cairo_fill (cr);
+
+    mask = cairo_pop_group (cr);
+    cairo_pop_group_to_source (cr);
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+    cairo_mask (cr, mask);
+
+    cairo_pattern_destroy (mask);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (bug_361,
+	    "Bug 361 (Problem with SVG backend and masks)",
+	    "mask, operator", /* keywords */
+	    NULL, /* requirements */
+	    100, 100,
+	    NULL, draw)
diff --git a/test/meson.build b/test/meson.build
index 0a7bf6d3a..4dc976d43 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -25,6 +25,7 @@ test_sources = [
   'big-trap.c',
   'bilevel-image.c',
   'bug-40410.c',
+  'bug-361.c',
   'bug-448.c',
   'bug-51910.c',
   'bug-75705.c',
diff --git a/test/reference/bug-361.ref.png b/test/reference/bug-361.ref.png
new file mode 100644
index 000000000..cf0385049
Binary files /dev/null and b/test/reference/bug-361.ref.png differ