diff --git a/web/tests/functional/products/test_config_db_share.py b/web/tests/functional/products/test_config_db_share.py
index 7b0c10952e..1d6792e956 100644
--- a/web/tests/functional/products/test_config_db_share.py
+++ b/web/tests/functional/products/test_config_db_share.py
@@ -178,9 +178,6 @@ def create_test_product(product_name, product_endpoint):
         with self.assertRaises(RequestFailed):
             self._pr_client_2.addProduct(product_cfg)
 
-        # self.assertTrue(self._pr_client_2.addProduct(product_cfg),
-        #                 "Cannot create product on secondary server.")
-
         # Product name full string match.
         products = self._pr_client_2.getProducts('producttest_second', None)
         self.assertEqual(len(products), 1)
diff --git a/web/tests/functional/store/test_store.py b/web/tests/functional/store/test_store.py
index 3ea8bbdad1..18d7e42d0d 100644
--- a/web/tests/functional/store/test_store.py
+++ b/web/tests/functional/store/test_store.py
@@ -72,10 +72,12 @@ def setup_class(self):
 
         server_access['viewer_product'] = 'store_limited_product'
         codechecker.add_test_package_product(server_access, TEST_WORKSPACE,
-                                             report_limit=2)
+                                             report_limit=2,
+                                             database_name='store_limited')
 
         server_access['viewer_product'] = 'store_test'
-        codechecker.add_test_package_product(server_access, TEST_WORKSPACE)
+        codechecker.add_test_package_product(server_access, TEST_WORKSPACE,
+                                             database_name='store_test')
 
         # Extend the checker configuration with the server access.
         codechecker_cfg.update(server_access)
diff --git a/web/tests/libtest/codechecker.py b/web/tests/libtest/codechecker.py
index 846011e05e..a10f40e903 100644
--- a/web/tests/libtest/codechecker.py
+++ b/web/tests/libtest/codechecker.py
@@ -733,7 +733,8 @@ def start_server_proc(event, server_cmd, checking_env):
 
 def add_test_package_product(server_data, test_folder, check_env=None,
                              protocol='http', report_limit=None,
-                             user_permissions=None):
+                             user_permissions=None,
+                             database_name="data.sqlite"):
     """
     Add a product for a test suite to the server provided by server_data.
     Server must be running before called.
@@ -781,7 +782,7 @@ def add_test_package_product(server_data, test_folder, check_env=None,
     else:
         # SQLite databases are put under the workspace of the appropriate test.
         add_command += ['--sqlite',
-                        os.path.join(test_folder, 'data.sqlite')]
+                        os.path.join(test_folder, database_name)]
 
     print(' '.join(add_command))