diff --git a/mantle/kola/README.md b/mantle/kola/README.md
index 1c2ceba01b..3f0abaefd1 100644
--- a/mantle/kola/README.md
+++ b/mantle/kola/README.md
@@ -187,7 +187,6 @@ import (
         _ "github.com/coreos/mantle/kola/tests/podman"
         _ "github.com/coreos/mantle/kola/tests/rkt"
         _ "github.com/coreos/mantle/kola/tests/rpmostree"
-        _ "github.com/coreos/mantle/kola/tests/systemd"
         _ "github.com/coreos/mantle/kola/tests/update"
 )
 ```
diff --git a/mantle/kola/registry/registry.go b/mantle/kola/registry/registry.go
index 3b96e3808f..12ae638779 100644
--- a/mantle/kola/registry/registry.go
+++ b/mantle/kola/registry/registry.go
@@ -14,6 +14,5 @@ import (
 	_ "github.com/coreos/mantle/kola/tests/podman"
 	_ "github.com/coreos/mantle/kola/tests/rhcos"
 	_ "github.com/coreos/mantle/kola/tests/rpmostree"
-	_ "github.com/coreos/mantle/kola/tests/systemd"
 	_ "github.com/coreos/mantle/kola/tests/upgrade"
 )
diff --git a/mantle/kola/tests/systemd/sysusers.go b/mantle/kola/tests/systemd/sysusers.go
deleted file mode 100644
index ca5ee51877..0000000000
--- a/mantle/kola/tests/systemd/sysusers.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package systemd
-
-import (
-	"github.com/coreos/mantle/kola/cluster"
-	"github.com/coreos/mantle/kola/register"
-)
-
-func init() {
-	register.RegisterTest(&register.Test{
-		Run:         gshadowParser,
-		ClusterSize: 1,
-		Name:        "systemd.sysusers.gshadow",
-		Distros:     []string{"fcos"},
-	})
-}
-
-// Verify that glibc's parsing of /etc/gshadow does not cause systemd-sysusers
-// to segfault on specially constructed lines.
-//
-// One line must fit into the character buffer (1024 bytes, unless a previous
-// line was longer) but have enough group members such that
-//
-//     line length + alignment + sizeof(char *) * (#adm + 1 + #mem + 1) > 1024.
-//
-// The parser would return early to avoid overflow, leaving the static result
-// struct pointing to pointers from the previous line which are now invalid,
-// causing segfaults when those pointers are dereferenced.
-//
-// Tests: https://github.com/coreos/bugs/issues/1394
-func gshadowParser(c cluster.TestCluster) {
-	m := c.Machines()[0]
-
-	c.MustSSH(m, `sudo sh -c "echo 'grp0:*::root' >> /etc/gshadow"`)
-	c.MustSSH(m, `sudo sh -c "echo 'grp1:*::somebody.a1,somebody.a2,somebody.a3,somebody.a4,somebody.a5,somebody.a6,somebody.a7,somebody.a8,somebody.a9,somebody.a10,somebody.a11,somebody.a12,somebody.a13,somebody.a14,somebody.a15,somebody.a16,somebody.a17,somebody.a18,somebody.a19,somebody.a20,somebody.a21,somebody.a22,somebody.a23,somebody.a24,somebody.a25,somebody.a26,somebody.a27,somebody.a28,somebody.a29,somebody.a30,somebody.a31,somebody.a32,somebody.a33,somebody.a34,somebody.a35,somebody.a36,somebody.a37,somebody.a38,somebody.a39,somebody.a40,somebody.a41,somebody.a42,somebody.a43,somebody.a44,somebody.a45,somebody.a46,somebody.a47,a1234' >> /etc/gshadow"`)
-	c.MustSSH(m, `sudo sh -c "echo 'grp2:*::root' >> /etc/gshadow"`)
-	c.MustSSH(m, `sudo systemd-sysusers`)
-}