diff --git a/create_test_dvd-1.testcase b/create_test_dvd-1.testcase
index 27544057..c5a36850 100644
--- a/create_test_dvd-1.testcase
+++ b/create_test_dvd-1.testcase
@@ -29,3 +29,4 @@ job lock name readline-doc
 job lock name SuSEfirewall2
 job lock name vim-data
 job lock name libgcc_s1-32bit
+job lock name gettext-runtime-mini
diff --git a/create_test_dvd-2.testcase b/create_test_dvd-2.testcase
index a3c6ec31..304f30c1 100644
--- a/create_test_dvd-2.testcase
+++ b/create_test_dvd-2.testcase
@@ -32,3 +32,9 @@ job install name xdelta
 job lock name gtk2-branding-upstream
 job lock name readline-doc
 job lock name libgcc_s1-32bit
+
+job lock name openvpn
+job lock name systemtap
+job lock name esound-daemon
+job lock name gettext-runtime-mini
+
diff --git a/create_test_dvds.sh b/create_test_dvds.sh
index b8f15d52..8f95b9ad 100644
--- a/create_test_dvds.sh
+++ b/create_test_dvds.sh
@@ -58,9 +58,15 @@ sync_prj openSUSE:Factory:Rings:1-MinimalX/standard minimalx
 
 regenerate_pl openSUSE:Factory:Rings:1-MinimalX 1 bootstrap minimalx
 
+sync_prj openSUSE:Factory:Rings:2-TestDVD/standard testdvd
+regenerate_pl openSUSE:Factory:Rings:2-TestDVD 2 bootstrap minimalx testdvd
+
 sync_prj openSUSE:Factory:Staging:A/standard staging_A
 regenerate_pl "openSUSE:Factory:Staging:A" 1 staging_A
 
+sync_prj openSUSE:Factory:Staging:A:DVD/standard staging_A-dvd
+regenerate_pl "openSUSE:Factory:Staging:A:DVD" 2 staging_A staging_A-dvd
+
 for l in B C D E F G H I J; do
   sync_prj openSUSE:Factory:Staging:$l/bootstrap_copy "staging_$l-bc"
   sync_prj openSUSE:Factory:Staging:$l/standard staging_$l
@@ -68,16 +74,10 @@ for l in B C D E F G H I J; do
 done
 
 projects=$(osc api /search/project/id?match='starts-with(@name,"openSUSE:Factory:Staging")' | grep :DVD | cut -d\" -f2)
-for prj in openSUSE:Factory:Rings:2-TestDVD $projects; do  
+for prj in openSUSE:Factory:Rings:2-TestDVD $projects; do
   perl $SCRIPTDIR/rebuildpacs.pl $prj standard x86_64
 done
 
-sync_prj openSUSE:Factory:Rings:2-TestDVD/standard testdvd
-regenerate_pl openSUSE:Factory:Rings:2-TestDVD 2 bootstrap minimalx testdvd
-
-sync_prj openSUSE:Factory:Staging:A:DVD/standard staging_A-dvd
-regenerate_pl "openSUSE:Factory:Staging:A:DVD" 2 staging_A staging_A-dvd
-
 for l in B C D E F G H I; do
   sync_prj openSUSE:Factory:Staging:$l:DVD/standard "staging_$l-dvd"
   regenerate_pl "openSUSE:Factory:Staging:$l:DVD" 2 "staging_$l-bc" staging_$l "staging_$l-dvd"
diff --git a/osc-check_repo.py b/osc-check_repo.py
index 11119a24..53430a31 100644
--- a/osc-check_repo.py
+++ b/osc-check_repo.py
@@ -737,9 +737,9 @@ def _check_repo_download(self, p, opts):
             todownload.append(('x86_64', fn[0], fn[3]))
 
         # now fetch -32bit packs
-        for fn in self._check_repo_repo_list(p.sproject, repo, 'i586', p.spackage, opts):
-            if fn[2] == 'x86_64':
-                todownload.append(('i586', fn[0], fn[3]))
+        #for fn in self._check_repo_repo_list(p.sproject, repo, 'i586', p.spackage, opts):
+        #    if fn[2] == 'x86_64':
+        #        todownload.append(('i586', fn[0], fn[3]))
 
         p.downloads[repo] = []
         for arch, fn, mt in todownload:
diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py
index 91016f3d..00bed889 100644
--- a/osclib/stagingapi.py
+++ b/osclib/stagingapi.py
@@ -679,7 +679,7 @@ class StagingAPI(object):
        for module in openqa['testmodules']:
           # zypper_in fails at the moment - urgent fix needed
           if module['result'] == 'ok': continue
-          if module['name'] in ['inkscape', 'gnucash', 'kate', 'thunderbird']:
+          if module['name'] in []:
              continue
           return "{} test failed: {}".format(module['name'], job['id'])
        return None