diff --git a/scripts/tests/e2/init.lua b/scripts/tests/e2/init.lua
index 9a42c971a..c75b05211 100644
--- a/scripts/tests/e2/init.lua
+++ b/scripts/tests/e2/init.lua
@@ -16,3 +16,4 @@ require 'tests.storage'
 require 'tests.magicbag'
 require 'tests.process'
 require 'tests.xmas'
+require 'tests.production'
diff --git a/scripts/tests/e2/production.lua b/scripts/tests/e2/production.lua
index f120e6916..c6d074f50 100644
--- a/scripts/tests/e2/production.lua
+++ b/scripts/tests/e2/production.lua
@@ -12,172 +12,6 @@ local function create_faction(race)
     return faction.create(race .. '@eressea.de', race, "de")
 end
 
-function test_laen_needs_mine()
-    -- some resources require a building
-    -- i.e. you cannot create laen without a mine
-    local r = region.create(0, 0, "mountain")
-    local f = create_faction('human')
-    local u = unit.create(f, r, 1)
-
-    turn_begin()
-    r:set_resource('laen', 100)
-    u:add_order("MACHE Laen")
-    u:set_skill('mining', 7)
-    turn_process()
-    assert_equal(0, u:get_item('laen'))
-    assert_equal(100, r:get_resource('laen'))
-    assert_equal(1, f:count_msg_type("error104")) -- requires building
-
-    u.building = building.create(u.region, "mine")
-    u.building.working = true
-    u.building.size = 10
-    turn_process()
-    assert_equal(1, u:get_item('laen'))
-    assert_equal(99, r:get_resource('laen'))
-
-    turn_end()
-end
-
-function test_mine_laen_bonus()
-    -- some buildings grant a bonus on the production skill
-    -- i.e. a mine adds +1 to mining
-    local r = region.create(0, 0, 'mountain')
-    local f = create_faction('human')
-    local u = unit.create(f, r, 1)
-
-    turn_begin()
-    r:set_resource('laen', 100)
-    assert_equal(100, r:get_resource('laen'))
-    u:add_order("MACHE Laen")
-    u:set_skill('mining', 6)
-    u.building = building.create(u.region, "mine")
-    u.building.working = true
-    u.building.size = 10
-    u.number = 2
-    turn_process() -- T6 is not enough for laen
-    assert_equal(0, u:get_item('laen'))
-    assert_equal(100, r:get_resource('laen'))
-    assert_equal(1, f:count_msg_type("manufacture_skills"))
-
-    u:set_skill('mining', 13)
-    turn_process() -- T13 is enough, the +1 produces one extra Laen
-    assert_equal(4, u:get_item('laen')) -- FAIL (3)
-    assert_equal(96, r:get_resource('laen'))
-
-    turn_end()
-end
-
-function test_mine_iron_bonus()
-    -- some buildings grant a bonus on the production skill
-    -- i.e. a mine adds +1 to mining iron
-    --
-    local r = region.create(0, 0, 'mountain')
-    local f = create_faction('human')
-    local u = unit.create(f, r, 1)
-
-    turn_begin()
-    r:set_resource('iron', 100)
-    assert_equal(100, r:get_resource('iron'))
-    u:add_order("MACHE Eisen")
-    u:set_skill('mining', 1)
-    u.building = building.create(u.region, "mine")
-    u.building.working = false
-    u.building.size = 10
-    u.number = 2
-    turn_process() -- iron can be made without a working mine
-    assert_equal(2, u:get_item('iron'))
-    assert_equal(98, r:get_resource('iron'))
-
-    u.building.working = true
-    turn_process()
-    assert_equal(6, u:get_item('iron'))
-    assert_equal(96, r:get_resource('iron'))
-
-    turn_end()
-end
-
-function test_quarry_bonus()
-    -- a quarry grants +1 to quarrying, and saves 50% stone
-    --
-    local r = region.create(0, 0, 'mountain')
-    local f = create_faction('human')
-    local u = unit.create(f, r, 1)
-
-    turn_begin()
-    r:set_resource('stone', 100)
-    assert_equal(100, r:get_resource('stone'))
-    u:add_order("MACHE Stein")
-    u:set_skill('quarrying', 1)
-    u.number = 2
-    u.building = building.create(u.region, 'quarry')
-    u.building.working = false
-    u.building.size = 10
-    turn_process()
-    assert_equal(2, u:get_item('stone'))
-    assert_equal(98, r:get_resource('stone'))
-
-    u.building.working = true
-    turn_process()
-    assert_equal(6, u:get_item('stone'))
-    assert_equal(96, r:get_resource('stone'))
-
-    turn_end()
-end
-
-function test_smithy_bonus_iron()
--- a smithy adds +1 to weaponsmithing, and saves 50% iron
-    local r = region.create(0, 0, 'mountain')
-    local f = create_faction('human')
-    local u = unit.create(f, r, 1)
-
-    turn_begin()
-    u.building = building.create(u.region, 'smithy')
-    u.building.working = false
-    u.building.size = 10
-    u:set_skill('weaponsmithing', 5) -- needs 3
-    u:add_item('iron', 100)
-    u:add_order("MACHE Schwert")
-    turn_process() -- building disabled
-    assert_equal(1, u:get_item('sword'))
-    assert_equal(99, u:get_item('iron'))
-
-    u.building.working = true
-    turn_process() -- building active
-    assert_equal(3, u:get_item('sword'))
-    assert_equal(98, u:get_item('iron'))
-
-    turn_end()
-end
-
-function test_smithy_bonus_mixed()
--- a smithy adds +1 to weaponsmithing, and saves 50% iron
--- it does not save any other resource, though.
-    local r = region.create(0, 0, 'mountain')
-    local f = create_faction('human')
-    local u = unit.create(f, r, 1)
-
-    turn_begin()
-    u.building = building.create(u.region, 'smithy')
-    u.building.working = false
-    u.building.size = 10
-    u:set_skill('weaponsmithing', 5) -- needs 3
-    u:add_item('iron', 100)
-    u:add_item('log', 100)
-    u:add_order("MACHE Kriegsaxt")
-    turn_process() -- building disabled
-    assert_equal(1, u:get_item('axe'))
-    assert_equal(99, u:get_item('iron'))
-    assert_equal(99, u:get_item('log'))
-
-    u.building.working = true
-    turn_process() -- building active
-    assert_equal(3, u:get_item('axe'))
-    assert_equal(98, u:get_item('iron'))
-    assert_equal(97, u:get_item('log'))
-
-    turn_end()
-end
-
 function test_greatbow_needs_elf()
 -- only elves can build a greatbow
     local r = region.create(0, 0, 'mountain')
diff --git a/scripts/tests/e3/init.lua b/scripts/tests/e3/init.lua
index aa253157e..174452897 100644
--- a/scripts/tests/e3/init.lua
+++ b/scripts/tests/e3/init.lua
@@ -1,4 +1,3 @@
-require 'tests.e3.production'
 require 'tests.e3.castles'
 require 'tests.e3.stealth'
 require 'tests.e3.spells'
@@ -11,3 +10,4 @@ require 'tests.common'
 -- require 'tests.report'
 require 'tests.magicbag'
 require 'tests.process'
+require 'tests.production'
diff --git a/scripts/tests/e3/production.lua b/scripts/tests/production.lua
similarity index 98%
rename from scripts/tests/e3/production.lua
rename to scripts/tests/production.lua
index 85fdeb638..5a1fcfc51 100644
--- a/scripts/tests/e3/production.lua
+++ b/scripts/tests/production.lua
@@ -1,6 +1,6 @@
 require "lunit"
 
-module("tests.e3.production", package.seeall, lunit.testcase )
+module("tests.production", package.seeall, lunit.testcase )
 
 function setup()
     eressea.game.reset()