57 files changed, 76 insertions, 77 deletions
diff --git a/source4/main.mk b/source4/main.mk
index 36a18060df..8d1f0467ae 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -283,7 +283,7 @@ realdistclean: distclean removebackup
 
 check:: test
 
-SELFTEST = $(PERL) $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} \
+SELFTEST = $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
     --expected-failures=$(srcdir)/samba4-knownfail \
     --skip=$(srcdir)/samba4-skip \
diff --git a/source4/script/tests/test_blackbox.sh b/source4/script/tests/test_blackbox.sh
deleted file mode 100755
index 1cab39c8f7..0000000000
--- a/source4/script/tests/test_blackbox.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# this runs tests that interact directly with the command-line tools rather than using the API
-
-if [ $# -lt 1 ]; then
-cat <<EOF
-Usage: test_blackbox.sh PREFIX [...]
-EOF
-exit 1;
-fi
-
-PREFIX=$1
-shift 1
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-plantest "blackbox.smbclient" dc $incdir/../../../testprogs/blackbox/test_smbclient.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.kinit" dc $incdir/../../../testprogs/blackbox/test_kinit.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$REALM" "$PREFIX" "$ADDARGS"
-
-plantest "blackbox.cifsdd" dc $incdir/../../../testprogs/blackbox/test_cifsdd.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh
deleted file mode 100755
index 7fb6efcc36..0000000000
--- a/source4/script/tests/tests_all.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
- $SRCDIR/script/tests/test_ejs.sh $CONFIGURATION
- $SRCDIR/script/tests/test_ldap.sh 
- $SRCDIR/script/tests/test_nbt.sh "dc"
- $SRCDIR/script/tests/test_rpc.sh
- $SRCDIR/script/tests/test_net.sh
- $SRCDIR/script/tests/test_session_key.sh
- $SRCDIR/script/tests/test_binding_string.sh
- $SRCDIR/script/tests/test_echo.sh
- $SRCDIR/script/tests/test_posix.sh
- $SRCDIR/script/tests/test_cifs.sh
- $SRCDIR/script/tests/test_local.sh
- $SRCDIR/script/tests/test_pidl.sh
- $SRCDIR/script/tests/test_blackbox.sh $PREFIX
- $SRCDIR/script/tests/test_simple.sh
- $SRCDIR/script/tests/test_s3upgrade.sh $PREFIX/upgrade
- $SRCDIR/script/tests/test_member.sh
- $SRCDIR/script/tests/test_nbt.sh "member"
diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
deleted file mode 100755
index 9c57f8b20a..0000000000
--- a/source4/script/tests/tests_quick.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-TORTURE_QUICK="yes"
-export TORTURE_QUICK
-
-$SRCDIR/script/tests/test_ejs.sh $CONFIGURATION
-$SRCDIR/script/tests/test_ldap.sh
-$SRCDIR/script/tests/test_nbt.sh
-$SRCDIR/script/tests/test_quick.sh
-$SRCDIR/script/tests/test_rpc_quick.sh
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 38c7afadd5..61e8081268 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -27,4 +27,4 @@ clean::
 # Swig testing
 
 swigtest: swig
-	./script/tests/test_swig.sh
+	./selftest/test_swig.sh
diff --git a/source4/script/tests/README b/source4/selftest/README
index 1eb7e7943c..1eb7e7943c 100644
--- a/source4/script/tests/README
+++ b/source4/selftest/README
diff --git a/source4/script/tests/Samba3.pm b/source4/selftest/Samba3.pm
index 8e11f4cee9..b12208bd9f 100644
--- a/source4/script/tests/Samba3.pm
+++ b/source4/selftest/Samba3.pm
@@ -187,8 +187,8 @@ sub provision($$)
 	my $username = `PATH=/usr/ucb:$ENV{PATH} whoami`;
 	my $password = "test";
 
-	my $srcdir="$RealBin/../..";
-	my $scriptdir="$srcdir/script/tests";
+	my $srcdir="$RealBin/..";
+	my $scriptdir="$srcdir/selftest";
 	my $prefix_abs = abs_path($prefix);
 	my $shrdir="$prefix_abs/tmp";
 	my $libdir="$prefix_abs/lib";
diff --git a/source4/script/tests/Samba4.pm b/source4/selftest/Samba4.pm
index 36550e35f3..acf5ceef3e 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/selftest/Samba4.pm
@@ -460,7 +460,7 @@ sub provision($$$$$$)
 	my $dnsname = "samba.example.com";
 	my $basedn = "dc=samba,dc=example,dc=com";
 	my $root = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
-	my $srcdir="$RealBin/../..";
+	my $srcdir="$RealBin/..";
 	-d $prefix or mkdir($prefix, 0777) or die("Unable to create $prefix");
 	my $prefix_abs = abs_path($prefix);
 	my $tmpdir = "$prefix_abs/tmp";
diff --git a/source4/script/tests/SocketWrapper.pm b/source4/selftest/SocketWrapper.pm
index e63605b8df..e63605b8df 100644
--- a/source4/script/tests/SocketWrapper.pm
+++ b/source4/selftest/SocketWrapper.pm
diff --git a/source4/script/tests/TODO b/source4/selftest/TODO
index 42f90188ed..42f90188ed 100644
--- a/source4/script/tests/TODO
+++ b/source4/selftest/TODO
diff --git a/source4/script/tests/Windows.pm b/source4/selftest/Windows.pm
index 710ffeda14..d0c90d7f7b 100644
--- a/source4/script/tests/Windows.pm
+++ b/source4/selftest/Windows.pm
@@ -29,7 +29,7 @@ sub provision($$$)
 
 	die ("$ENV{WINTESTCONF} could not be read.") if (! -r $ENV{WINTESTCONF});
 
-	$ENV{WINTEST_DIR}="$ENV{SRCDIR}/script/tests/win";
+	$ENV{WINTEST_DIR}="$ENV{SRCDIR}/selftest/win";
 }
 
 sub setup_env($$)
diff --git a/source4/script/tests/mk-keyblobs.sh b/source4/selftest/mk-keyblobs.sh
index 7792e0a6d5..7792e0a6d5 100755
--- a/source4/script/tests/mk-keyblobs.sh
+++ b/source4/selftest/mk-keyblobs.sh
diff --git a/source4/script/tests/selftest.pl b/source4/selftest/selftest.pl
index 1d70a4fa52..104fc7d15f 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -470,7 +470,7 @@ unless (defined($ENV{VALGRIND})) {
 	$ENV{MALLOC_CHECK_} = 2;
 }
 
-my $old_pwd = "$RealBin/../..";
+my $old_pwd = "$RealBin/..";
 
 # Backwards compatibility:
 if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") {
@@ -644,7 +644,7 @@ print "OPTIONS $ENV{TORTURE_OPTIONS}\n";
 
 my @todo = ();
 
-my $testsdir = "$srcdir/script/tests";
+my $testsdir = "$srcdir/selftest";
 $ENV{CONFIGURATION} = "--configfile=$conffile";
 
 
diff --git a/source4/script/tests/test_binding_string.sh b/source4/selftest/test_binding_string.sh
index a8afc07ac1..a8afc07ac1 100755
--- a/source4/script/tests/test_binding_string.sh
+++ b/source4/selftest/test_binding_string.sh
diff --git a/source4/selftest/test_blackbox.sh b/source4/selftest/test_blackbox.sh
new file mode 100755
index 0000000000..6397918fff
--- /dev/null
+++ b/source4/selftest/test_blackbox.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# this runs tests that interact directly with the command-line tools rather than using the API
+
+if [ $# -lt 1 ]; then
+cat <<EOF
+Usage: test_blackbox.sh PREFIX [...]
+EOF
+exit 1;
+fi
+
+PREFIX=$1
+shift 1
+ADDARGS="$*"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+plantest "blackbox.smbclient" dc $incdir/../../testprogs/blackbox/test_smbclient.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
+plantest "blackbox.kinit" dc $incdir/../../testprogs/blackbox/test_kinit.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$REALM" "$PREFIX" "$ADDARGS"
+
+plantest "blackbox.cifsdd" dc $incdir/../../testprogs/blackbox/test_cifsdd.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
diff --git a/source4/script/tests/test_cifs.sh b/source4/selftest/test_cifs.sh
index 2bf3c4a5b1..2bf3c4a5b1 100755
--- a/source4/script/tests/test_cifs.sh
+++ b/source4/selftest/test_cifs.sh
diff --git a/source4/script/tests/test_echo.sh b/source4/selftest/test_echo.sh
index f09aeca4e5..f09aeca4e5 100755
--- a/source4/script/tests/test_echo.sh
+++ b/source4/selftest/test_echo.sh
diff --git a/source4/script/tests/test_ejs.sh b/source4/selftest/test_ejs.sh
index 858602ce38..858602ce38 100755
--- a/source4/script/tests/test_ejs.sh
+++ b/source4/selftest/test_ejs.sh
diff --git a/source4/script/tests/test_functions.sh b/source4/selftest/test_functions.sh
index 6a7f8aba98..6a7f8aba98 100755
--- a/source4/script/tests/test_functions.sh
+++ b/source4/selftest/test_functions.sh
diff --git a/source4/script/tests/test_ldap.sh b/source4/selftest/test_ldap.sh
index 4a31451a01..4a31451a01 100755
--- a/source4/script/tests/test_ldap.sh
+++ b/source4/selftest/test_ldap.sh
diff --git a/source4/script/tests/test_local.sh b/source4/selftest/test_local.sh
index e8bf10c901..e8bf10c901 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/selftest/test_local.sh
diff --git a/source4/script/tests/test_member.sh b/source4/selftest/test_member.sh
index b1bb0c7b09..b1bb0c7b09 100755
--- a/source4/script/tests/test_member.sh
+++ b/source4/selftest/test_member.sh
diff --git a/source4/script/tests/test_nbt.sh b/source4/selftest/test_nbt.sh
index ceac810922..ceac810922 100755
--- a/source4/script/tests/test_nbt.sh
+++ b/source4/selftest/test_nbt.sh
diff --git a/source4/script/tests/test_net.sh b/source4/selftest/test_net.sh
index 7973461f98..7973461f98 100755
--- a/source4/script/tests/test_net.sh
+++ b/source4/selftest/test_net.sh
diff --git a/source4/script/tests/test_pidl.sh b/source4/selftest/test_pidl.sh
index d143cd6b0a..d143cd6b0a 100755
--- a/source4/script/tests/test_pidl.sh
+++ b/source4/selftest/test_pidl.sh
diff --git a/source4/script/tests/test_posix.sh b/source4/selftest/test_posix.sh
index 88040def88..88040def88 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/selftest/test_posix.sh
diff --git a/source4/script/tests/test_quick.sh b/source4/selftest/test_quick.sh
index e2c14e42f2..e2c14e42f2 100755
--- a/source4/script/tests/test_quick.sh
+++ b/source4/selftest/test_quick.sh
diff --git a/source4/script/tests/test_rpc.sh b/source4/selftest/test_rpc.sh
index 724196bbfa..724196bbfa 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/selftest/test_rpc.sh
diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/selftest/test_rpc_quick.sh
index 8793e0b6e6..8793e0b6e6 100755
--- a/source4/script/tests/test_rpc_quick.sh
+++ b/source4/selftest/test_rpc_quick.sh
diff --git a/source4/script/tests/test_s3upgrade.sh b/source4/selftest/test_s3upgrade.sh
index df7ae43c2a..1ed43cb8eb 100755
--- a/source4/script/tests/test_s3upgrade.sh
+++ b/source4/selftest/test_s3upgrade.sh
@@ -16,7 +16,7 @@ export PATH
 mkdir -p $PREFIX
 rm -f $PREFIX/*
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
 plantest "parse samba3" none bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
 #plantest "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
diff --git a/source4/script/tests/test_samba4.pl b/source4/selftest/test_samba4.pl
index 8476e6e38f..f2935be66b 100755
--- a/source4/script/tests/test_samba4.pl
+++ b/source4/selftest/test_samba4.pl
@@ -5,12 +5,11 @@ use FindBin qw($RealBin);
 use lib $RealBin;
 use Samba4;
 
-my $s = new Samba4($RealBin."/../../bin", undef, $RealBin."/../../setup");
+my $s = new Samba4($RealBin."/../bin", undef, $RealBin."/../setup");
 
 ok($s);
 
-is($RealBin."/../../bin", $s->{bindir});
-
+is($RealBin."/../bin", $s->{bindir});
 
 ok($s->write_ldb_file("tmpldb", "
 dn: a=b
diff --git a/source4/script/tests/test_session_key.sh b/source4/selftest/test_session_key.sh
index 30d03431ba..30d03431ba 100755
--- a/source4/script/tests/test_session_key.sh
+++ b/source4/selftest/test_session_key.sh
diff --git a/source4/script/tests/test_simple.sh b/source4/selftest/test_simple.sh
index a4a672cd5b..a4a672cd5b 100755
--- a/source4/script/tests/test_simple.sh
+++ b/source4/selftest/test_simple.sh
diff --git a/source4/script/tests/test_swig.sh b/source4/selftest/test_swig.sh
index 9f5e7c0ebf..9f5e7c0ebf 100755
--- a/source4/script/tests/test_swig.sh
+++ b/source4/selftest/test_swig.sh
diff --git a/source4/script/tests/test_w2k3.sh b/source4/selftest/test_w2k3.sh
index b262029892..b262029892 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/selftest/test_w2k3.sh
diff --git a/source4/script/tests/test_w2k3_file.sh b/source4/selftest/test_w2k3_file.sh
index f008d49128..f008d49128 100755
--- a/source4/script/tests/test_w2k3_file.sh
+++ b/source4/selftest/test_w2k3_file.sh
diff --git a/source4/script/tests/test_win.sh b/source4/selftest/test_win.sh
index 56d96c041c..4e5558c206 100755
--- a/source4/script/tests/test_win.sh
+++ b/source4/selftest/test_win.sh
@@ -7,7 +7,7 @@
 # Copyright Brad Henry <brad@samba.org> 2006
 # Released under the GNU GPL v2 or later.
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
 export SMBTORTURE_REMOTE_HOST=`perl -I$WINTEST_DIR $WINTEST_DIR/vm_get_ip.pl VM_CFG_PATH`
 if [ -z $SMBTORTURE_REMOTE_HOST ]; then
diff --git a/source4/selftest/tests_all.sh b/source4/selftest/tests_all.sh
new file mode 100755
index 0000000000..7a1167e9ac
--- /dev/null
+++ b/source4/selftest/tests_all.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+ $SRCDIR/selftest/test_ejs.sh $CONFIGURATION
+ $SRCDIR/selftest/test_ldap.sh 
+ $SRCDIR/selftest/test_nbt.sh "dc"
+ $SRCDIR/selftest/test_rpc.sh
+ $SRCDIR/selftest/test_net.sh
+ $SRCDIR/selftest/test_session_key.sh
+ $SRCDIR/selftest/test_binding_string.sh
+ $SRCDIR/selftest/test_echo.sh
+ $SRCDIR/selftest/test_posix.sh
+ $SRCDIR/selftest/test_cifs.sh
+ $SRCDIR/selftest/test_local.sh
+ $SRCDIR/selftest/test_pidl.sh
+ $SRCDIR/selftest/test_blackbox.sh $PREFIX
+ $SRCDIR/selftest/test_simple.sh
+ $SRCDIR/selftest/test_s3upgrade.sh $PREFIX/upgrade
+ $SRCDIR/selftest/test_member.sh
+ $SRCDIR/selftest/test_nbt.sh "member"
diff --git a/source4/selftest/tests_quick.sh b/source4/selftest/tests_quick.sh
new file mode 100755
index 0000000000..bb3065b0a3
--- /dev/null
+++ b/source4/selftest/tests_quick.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+TORTURE_QUICK="yes"
+export TORTURE_QUICK
+
+$SRCDIR/selftest/test_ejs.sh $CONFIGURATION
+$SRCDIR/selftest/test_ldap.sh
+$SRCDIR/selftest/test_nbt.sh
+$SRCDIR/selftest/test_quick.sh
+$SRCDIR/selftest/test_rpc_quick.sh
diff --git a/source4/script/tests/tests_win.sh b/source4/selftest/tests_win.sh
index e25c29d4c9..19460eee0e 100755
--- a/source4/script/tests/tests_win.sh
+++ b/source4/selftest/tests_win.sh
@@ -21,10 +21,10 @@
        exit 1
  fi
 
- export WINTEST_DIR=$SRCDIR/script/tests/win
+ export WINTEST_DIR=$SRCDIR/selftest/win
  export TMPDIR=$TMPDIR
  export NETBIOSNAME=$NETBIOSNAME
 
  . $WINTESTCONF
 
- $SRCDIR/script/tests/test_win.sh
+ $SRCDIR/selftest/test_win.sh
diff --git a/source4/script/tests/tests_win2k3_dc.sh b/source4/selftest/tests_win2k3_dc.sh
index 5e22c37e97..290a4ef666 100755
--- a/source4/script/tests/tests_win2k3_dc.sh
+++ b/source4/selftest/tests_win2k3_dc.sh
@@ -11,12 +11,12 @@ if [ ! -r $WINTESTCONF ]; then
 	exit 1
 fi
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
 export SRCDIR=$SRCDIR
 
 tests="RPC-DRSUAPI RPC-SPOOLSS ncacn_np ncacn_ip_tcp"
 
 for name in $tests; do
-	testit $name rpc $SRCDIR/script/tests/win/wintest_2k3_dc.sh $name
+	testit $name rpc $SRCDIR/selftest/win/wintest_2k3_dc.sh $name
 done
diff --git a/source4/script/tests/win/README b/source4/selftest/win/README
index 06b64e5b02..fc934385c4 100644
--- a/source4/script/tests/win/README
+++ b/source4/selftest/win/README
@@ -77,7 +77,7 @@ difference is that we will need to run these tests as root. To run the
 Windows tests in the build farm, a .fns file will need to be created for
 your new host that exports a WINTESTCONF environment variable pointing to a
 config file used by 'make wintest'. An example of this config file can be
-found at source/script/tests/win/test_win.conf in the Samba 4 source tree. 
+found at source/selftest/win/test_win.conf in the Samba 4 source tree. 
 
 I've also included the bnhtest.fns file that I'm using for my build farm host
 below, as an example. It was modified from generic.fns.
diff --git a/source4/script/tests/win/VMHost.pm b/source4/selftest/win/VMHost.pm
index 359d8df315..359d8df315 100644
--- a/source4/script/tests/win/VMHost.pm
+++ b/source4/selftest/win/VMHost.pm
diff --git a/source4/script/tests/win/common.exp b/source4/selftest/win/common.exp
index a7ba95d722..a7ba95d722 100644
--- a/source4/script/tests/win/common.exp
+++ b/source4/selftest/win/common.exp
diff --git a/source4/script/tests/win/test_win.conf b/source4/selftest/win/test_win.conf
index ed52be999e..ed52be999e 100644
--- a/source4/script/tests/win/test_win.conf
+++ b/source4/selftest/win/test_win.conf
diff --git a/source4/script/tests/win/vm_get_ip.pl b/source4/selftest/win/vm_get_ip.pl
index 9286786155..9286786155 100644
--- a/source4/script/tests/win/vm_get_ip.pl
+++ b/source4/selftest/win/vm_get_ip.pl
diff --git a/source4/script/tests/win/vm_load_snapshot.pl b/source4/selftest/win/vm_load_snapshot.pl
index e8ba9b39cf..e8ba9b39cf 100644
--- a/source4/script/tests/win/vm_load_snapshot.pl
+++ b/source4/selftest/win/vm_load_snapshot.pl
diff --git a/source4/script/tests/win/wintest_2k3_dc.sh b/source4/selftest/win/wintest_2k3_dc.sh
index ed964a274a..ed964a274a 100755
--- a/source4/script/tests/win/wintest_2k3_dc.sh
+++ b/source4/selftest/win/wintest_2k3_dc.sh
diff --git a/source4/script/tests/win/wintest_base.sh b/source4/selftest/win/wintest_base.sh
index b12d2923f7..b78da4f7c9 100755
--- a/source4/script/tests/win/wintest_base.sh
+++ b/source4/selftest/win/wintest_base.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
-. script/tests/win/wintest_functions.sh
+. selftest/win/wintest_functions.sh
 
 # This variable is defined in the per-hosts .fns file.
 . $WINTESTCONF
diff --git a/source4/script/tests/win/wintest_client.exp b/source4/selftest/win/wintest_client.exp
index 5b45eb2bb0..5b45eb2bb0 100644
--- a/source4/script/tests/win/wintest_client.exp
+++ b/source4/selftest/win/wintest_client.exp
diff --git a/source4/script/tests/win/wintest_client.sh b/source4/selftest/win/wintest_client.sh
index 42fbc5c805..6b76ae36f7 100755
--- a/source4/script/tests/win/wintest_client.sh
+++ b/source4/selftest/win/wintest_client.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
-. script/tests/win/wintest_functions.sh
+. selftest/win/wintest_functions.sh
 
 # This variable is defined in the per-hosts .fns file.
 . $WINTESTCONF
diff --git a/source4/script/tests/win/wintest_functions.sh b/source4/selftest/win/wintest_functions.sh
index 3c0a1dccac..3c0a1dccac 100755
--- a/source4/script/tests/win/wintest_functions.sh
+++ b/source4/selftest/win/wintest_functions.sh
diff --git a/source4/script/tests/win/wintest_net.sh b/source4/selftest/win/wintest_net.sh
index 9cd10ad2e0..88cec1f3a7 100755
--- a/source4/script/tests/win/wintest_net.sh
+++ b/source4/selftest/win/wintest_net.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
-. script/tests/win/wintest_functions.sh
+. selftest/win/wintest_functions.sh
 
 # This variable is defined in the per-hosts .fns file.
 . $WINTESTCONF
diff --git a/source4/script/tests/win/wintest_raw.sh b/source4/selftest/win/wintest_raw.sh
index 9194343153..541e19829a 100755
--- a/source4/script/tests/win/wintest_raw.sh
+++ b/source4/selftest/win/wintest_raw.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
-. script/tests/win/wintest_functions.sh
+. selftest/win/wintest_functions.sh
 
 # This variable is defined in the per-hosts .fns file.
 . $WINTESTCONF
diff --git a/source4/script/tests/win/wintest_remove.exp b/source4/selftest/win/wintest_remove.exp
index a361db2958..a361db2958 100644
--- a/source4/script/tests/win/wintest_remove.exp
+++ b/source4/selftest/win/wintest_remove.exp
diff --git a/source4/script/tests/win/wintest_rpc.sh b/source4/selftest/win/wintest_rpc.sh
index f026602a6c..d0a0783c2e 100755
--- a/source4/script/tests/win/wintest_rpc.sh
+++ b/source4/selftest/win/wintest_rpc.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-. script/tests/test_functions.sh
+. selftest/test_functions.sh
 
-. script/tests/win/wintest_functions.sh
+. selftest/win/wintest_functions.sh
 
 # This variable is defined in the per-hosts .fns file.
 . $WINTESTCONF
diff --git a/source4/script/tests/win/wintest_setup.exp b/source4/selftest/win/wintest_setup.exp
index 1dcbabb488..1dcbabb488 100644
--- a/source4/script/tests/win/wintest_setup.exp
+++ b/source4/selftest/win/wintest_setup.exp