--- a/t/01-zone-mk.t	Wed Jun 29 11:42:51 2011 +0200
+++ b/t/01-zone-mk.t	Thu Jun 30 09:45:38 2011 +0200
@@ -1,6 +1,9 @@
 use strict;
 use warnings;
 
+use lib 't/lib';
+use Aux;
+
 use Test::More;
 use File::Temp qw(tempdir);
 use Net::LibIDN qw(:all);
@@ -22,18 +25,15 @@
 system("$CMD &>/dev/null");
 ok($? > 0, "error on missing args");
 
-my $master_dir = tempdir CLEANUP => 1;
-my $config_dir = tempdir CLEANUP => 1;
-my $tmp = File::Temp->new;
+
+$_ = File::Temp::tempdir CLEANUP => 1 or die "Can't make temporary directory" for my ($master_dir, $config_dir);
+my $tmp = Aux::make_config {
+    master_dir => $master_dir,
+    zone_conf_dir => $config_dir,
+    hostmaster => 'hostmaster@schlittermann.de',
+    template_dir => './templates'
+};
 $ENV{DNSTOOLS_CONF} = $tmp->filename;
-
-print $tmp <<__EOF;
-master_dir = $master_dir
-zone_conf_dir = $config_dir
-hostmaster = hostmaster\@schlittermann.de
-template_dir = ./templates		
-__EOF
-
 system("$CMD xxx müller.de &>/dev/null");
 is($? => 0, "created zone");