diff --git a/debian/changelog b/debian/changelog
index 081eba4d6..38d6494ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ systemd (220-7) UNRELEASED; urgency=medium
       ones and ignoring fuzz), and builds a dsc.
    - Add debian/patches/upstream-master/: These patches override the ones in
      debian/patches/ for trunk builds, in order to apply.
+  * ifupdown-hotplug autopkgtest: Fix config name in interfaces.d/, it must
+    not have a suffix in Debian. Also clean up the file after the test.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 12 Jun 2015 08:05:46 +0200
 
diff --git a/debian/tests/ifupdown-hotplug b/debian/tests/ifupdown-hotplug
index e0cc7d2bb..90682c81c 100755
--- a/debian/tests/ifupdown-hotplug
+++ b/debian/tests/ifupdown-hotplug
@@ -9,12 +9,13 @@ if [ -e /sys/class/net/$IFACE ]; then
     exit 0
 fi
 
-cat <<EOF > /etc/network/interfaces.d/${IFACE}.cfg
+cat <<EOF > /etc/network/interfaces.d/$IFACE
 allow-hotplug $IFACE
 iface $IFACE inet static
     address 192.168.234.129
     netmask 255.255.255.0
 EOF
+trap "rm /etc/network/interfaces.d/$IFACE" EXIT INT QUIT PIPE
 
 # these should trigger uevents and ifup@.service
 ip link add name $IFACE type veth peer name v$IFACE