--- a/pvl/hosts/tests.py	Thu Feb 26 18:22:58 2015 +0200
+++ b/pvl/hosts/tests.py	Thu Feb 26 18:32:32 2015 +0200
@@ -130,39 +130,36 @@
         ])
 
     def testApplyIncludes(self):
-        self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/includes.test']), [
-                ('foo@includes.test', dict(
+        self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test/test']), [
+                ('foo@test', dict(
                     ip          = ipaddr.IPAddress('192.0.2.1'),
                 )),
-                ('bar@includes.test', dict(
+                ('bar@test', dict(
                     ip          = ipaddr.IPAddress('192.0.2.2'),
                 )),
-                ('quux@includes.test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.3'),
-                )),
         ])
 
     def testApplyDirectory(self):
-        self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/included.test/']), [
-                ('quux@asdf.included.test', dict(
+        self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test/']), [
+                ('quux@asdf.test', dict(
                     ip          = ipaddr.IPAddress('192.0.2.5'),
                 )),
-                ('foo@included.test', dict(
+                ('foo@test', dict(
                     ip          = ipaddr.IPAddress('192.0.2.1'),
                 )),
-                ('bar@included.test', dict(
+                ('bar@test', dict(
                     ip          = ipaddr.IPAddress('192.0.2.2'),
                 )),
         ])
 
     def testApply(self):
-        self.assertHostsEqual(config.apply(self.options, ['etc/hosts/test']), [
-                ('foo@test', dict(
-                    ip          = ipaddr.IPAddress('127.0.0.1'),
+        self.assertHostsEqual(config.apply(self.options, ['etc/hosts/example.com']), [
+                ('foo@example.com', dict(
+                    ip          = ipaddr.IPAddress('192.0.2.1'),
                     ethernet    = {None: '00:11:22:33:44:55'},
                 )),
-                ('bar@test', dict(
-                    ip          = ipaddr.IPAddress('127.0.0.2'),
+                ('bar@example.com', dict(
+                    ip          = ipaddr.IPAddress('192.0.2.2'),
                     ethernet    = {None: '01:23:45:67:89:ab'},
                 )),
         ])