--- t/koha/01-remove-test-user.t	2011/05/20 12:00:45	103
+++ t/koha/01-remove-test-user.t	2011/07/14 18:49:24	104
@@ -5,11 +5,18 @@
 
 use Test::More tests => 6;
 use Test::WWW::Mechanize;
+use XML::Simple;
+use Data::Dump qw(dump);
 
-our ( $user, $passwd );
-require 'config.pl';
+my $url =       $ENV{INTRANET}  || 'http://ffzg.koha-dev.rot13.org:8080';
+my $koha_conf = $ENV{KOHA_CONF} || '/etc/koha/sites/ffzg/koha-conf.xml';
 
-my $url = 'https://localhost:8443'; # Koha intranet
+my $xml = XMLin( $koha_conf );
+diag 'Koha config = ',dump $xml->{config};
+
+our $config;
+require 't/config.pl';
+diag 'test config = ',dump $config;
 
 my $mech = Test::WWW::Mechanize->new;
 
@@ -17,10 +24,10 @@
 
 $mech->submit_form_ok({
 	fields => {
-		userid => $user,
-		password => $passwd,
+		userid   => $xml->{config}->{user},
+		password => $xml->{config}->{pass},
 	},
-}, 'login');
+}, "login $xml->{config}->{user}");
 
 $mech->submit_form_ok({
 	form_number => 2,