diff --git a/slapos/software.cfg b/slapos/software.cfg
index 009bb8909a4c40c5ca1119a76e104386141f28e7..d48c027c3e80f4b6bacda6e457394837687ddf44 100644
--- a/slapos/software.cfg
+++ b/slapos/software.cfg
@@ -223,6 +223,10 @@ initialization =
   [bt5_path_list.extend([bt5_path, '%s/*' % bt5_path]) for bt5_path in temp_bt5_path_list]
   os.environ['erp5_tests_bt5_path'] = ','.join(bt5_path_list)
   sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x, 'tests']) for x in '''${erp5_repository_list:repository_id_list}'''.split(' ')]
+  import glob
+  product_test_path_list = []
+  [product_test_path_list.extend(glob.glob('/'.join(['''${buildout:parts-directory}''', x, 'product/*/tests']))) for x in '''${erp5_repository_list:repository_id_list}'''.split(' ')]
+  sys.path[0:0] = product_test_path_list
 
 [test_suite_runner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not