diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index bbdd432b0ff..3ba0c2f9084 100644
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -45,62 +45,26 @@
 ^samba3.raw.acls\(nt4_dc\)
 ^samba3.raw.chkpath\(ad_dc\)
 ^samba3.raw.chkpath\(nt4_dc\)
-^samba3.raw.close\(ad_dc\)
-^samba3.raw.close\(nt4_dc\)
-^samba3.raw.composite\(ad_dc\)
-^samba3.raw.composite\(nt4_dc\)
-^samba3.raw.eas\(ad_dc\)
-^samba3.raw.eas\(nt4_dc\)
 ^samba3.raw.lock\(nt4_dc\)
-^samba3.raw.mkdir\(ad_dc\)
-^samba3.raw.mkdir\(nt4_dc\)
 ^samba3.raw.notify\(nt4_dc\)
-^samba3.raw.open\(ad_dc\)
-^samba3.raw.open\(nt4_dc\)
 ^samba3.raw.oplock\(nt4_dc\)
 ^samba3.raw.read\(ad_dc\)
 ^samba3.raw.read aio\(nt4_dc\)
 ^samba3.raw.read\(nt4_dc\)
-^samba3.raw.rename\(ad_dc\)
-^samba3.raw.rename\(nt4_dc\)
-^samba3.raw.samba3badnameblob\(ad_dc\)
-^samba3.raw.samba3badnameblob\(nt4_dc\)
-^samba3.raw.samba3badpath\(ad_dc\)
-^samba3.raw.samba3badpath\(nt4_dc\)
-^samba3.raw.samba3caseinsensitive\(ad_dc\)
-^samba3.raw.samba3caseinsensitive\(nt4_dc\)
 ^samba3.raw.samba3checkfsp\(nt4_dc\)
 ^samba3.raw.samba3checkfsp\(simpleserver\)
 ^samba3.raw.samba3closeerr\(simpleserver\)
 ^samba3.raw.samba3hide\(nt4_dc\)
 ^samba3.raw.samba3hide\(simpleserver\)
-^samba3.raw.samba3oplocklogoff\(ad_dc\)
-^samba3.raw.samba3oplocklogoff\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock\(ad_dc\)
+^samba3.raw.samba3posixtimedlock\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock brl_delay_inject1\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock brl_delay_inject2\(nt4_dc\)
-^samba3.raw.samba3posixtimedlock\(nt4_dc\)
-^samba3.raw.samba3rootdirfid\(ad_dc\)
-^samba3.raw.samba3rootdirfid\(nt4_dc\)
 ^samba3.raw.search\(ad_dc\)
 ^samba3.raw.search\(nt4_dc\)
-^samba3.raw.seek\(ad_dc\)
-^samba3.raw.seek\(nt4_dc\)
 ^samba3.raw.session krb5\(ad_dc\)
 ^samba3.raw.session ntlm\(ad_dc\)
 ^samba3.raw.session plain\(nt4_dc\)
-^samba3.raw.sfileinfo.bug\(ad_dc\)
-^samba3.raw.sfileinfo.bug\(nt4_dc\)
-^samba3.raw.sfileinfo.end-of-file\(ad_dc\)
-^samba3.raw.sfileinfo.end-of-file\(nt4_dc\)
-^samba3.raw.sfileinfo.rename\(ad_dc\)
-^samba3.raw.sfileinfo.rename\(nt4_dc\)
-^samba3.raw.streams\(ad_dc\)
-^samba3.raw.streams\(nt4_dc\)
-^samba3.raw.unlink\(ad_dc\)
-^samba3.raw.unlink\(nt4_dc\)
-^samba3.raw.write\(ad_dc\)
-^samba3.raw.write\(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,bigendian\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect,bigendian\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect\] \(nt4_dc\)
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 014d38b1487..016c4e405f5 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -762,7 +762,26 @@ for t in tests:
                   "rpc.samba3.smb-reauth1",
                   "rpc.samba3.smb-reauth2",
                   "rpc.samba3.spoolss",
-                  "rpc.samba3.wkssvc",]):
+                  "rpc.samba3.wkssvc",]) \
+        or (t in ["raw.close",
+                  "raw.composite",
+                  "raw.eas",
+                  "raw.mkdir",
+                  "raw.open",
+                  "raw.rename",
+                  "raw.samba3badnameblob",
+                  "raw.samba3badpath",
+                  "raw.samba3caseinsensitive",
+                  "raw.samba3oplocklogoff",
+                  "raw.samba3posixtimedlock",
+                  "raw.samba3rootdirfid",
+                  "raw.seek",
+                  "raw.sfileinfo.bug",
+                  "raw.sfileinfo.end-of-file",
+                  "raw.sfileinfo.rename",
+                  "raw.streams",
+                  "raw.unlink",
+                  "raw.write",]) :
         plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     else: