diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9d08f7e9caa..531f64f92fd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2954,7 +2954,9 @@ selftestdir = ../selftest
 S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin"
 
 selftest:: all torture timelimit
-	@$(S3_LD_LIBPATH_OVERRIDE) PERL="$(PERL)" \
+	@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
+		SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
+		PERL="$(PERL)" PYTHON="$(PYTHON)" \
 		$(PERL) $(selftestdir)/selftest.pl \
 		--prefix=${selftest_prefix} --target=samba3 \
 		--testlist="$(srcdir)/selftest/tests.sh|" \
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 0ac194ef174..812a3a7fe8b 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -129,3 +129,42 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb
 
 plantest "blackbox.net_s3" dc BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" script/tests/test_net_s3.sh
 
+(
+	shift $#
+	testitprefix="posix_s3."
+	testitenv="dc:local"
+
+	SMBTORTURE4BINARY=$SMBTORTURE4
+	TORTURE4_OPTIONS=""
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --configfile=\$SMB_CONF_PATH"
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME"
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=$SELFTEST_TARGET"
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --basedir=$SELFTEST_PREFIX"
+	if [ -n "$SELFTEST_VERBOSE" ]; then
+		TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:progress=no"
+	fi
+	TORTURE_OPTIONS="$TORTURE4_OPTIONS --format=subunit"
+	if [ -n "$SELFTEST_QUICK" ]; then
+		TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:quick=yes"
+	fi
+
+	# This is an ugly hack...
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:localdir=$SELFTEST_PREFIX/dc/share"
+
+	if [ -x "$SMBTORTURE4" ]; then
+		LIB_PATH_VAR_VAR="\$`echo $LIB_PATH_VAR`"
+		S4_LIB_PREFIX=`eval echo "$LIB_PATH_VAR=\"$SAMBA4SHAREDDIR:$LIB_PATH_VAR_VAR\""`
+		SMBTORTURE4="$S4_LIB_PREFIX $SMBTORTURE4"
+		SMBTORTURE4VERSION=`eval $SMBTORTURE4 --version`
+	fi
+	if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
+		echo "Using SMBTORTURE4: $SMBTORTURE4BINARY"
+		echo "Version: $SMBTORTURE4VERSION"
+		. $SCRIPTDIR/test_posix_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" ""
+	else
+		echo "Skip Tests with Samba4's smbtorture"
+		echo "Try to compile with --with-smbtorture4-path=PATH to enable"
+	fi
+
+)
+