diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
index ccce1cc..04befef 100644
--- a/tests/integration/__init__.py
+++ b/tests/integration/__init__.py
@@ -1,9 +1,11 @@
 import os.path
 from bootstrapvz.common.tools import load_data
 
-combine_manifests_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'manifests')
-manifests = {'base': load_data(os.path.join(combine_manifests_path, 'base.yml')),
-             'partitioned': load_data(os.path.join(combine_manifests_path, 'partitioned.yml')),
-             'unpartitioned': load_data(os.path.join(combine_manifests_path, 'unpartitioned.yml')),
-             }
+partial_manifests_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'manifests')
+import glob
+partial_yaml = glob.glob(os.path.join(partial_manifests_path, '*.yml'))
+partial_json = glob.glob(os.path.join(partial_manifests_path, '*.json'))
+manifests = {}
+for path in partial_yaml + partial_json:
+	manifests[os.path.basename(path)] = load_data(path)
 build_settings = load_data(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'build_settings.yml'))