diff --git a/pyp2rpm/metadata_extractors.py b/pyp2rpm/metadata_extractors.py
index b0a274a3..792e221a 100644
--- a/pyp2rpm/metadata_extractors.py
+++ b/pyp2rpm/metadata_extractors.py
@@ -100,6 +100,7 @@ def __init__(self, local_file, name, name_convertor, version,
         self.venv = venv
         self.base_python_version = base_python_version
         self.metadata_extension = metadata_extension
+        self.builtin_build_deps = [['BuildRequires', 'python2-devel'], ['BuildRequires', 'python-setuptools']]
 
     def name_convert_deps_list(self, deps_list):
         for dep in deps_list:
@@ -358,13 +359,12 @@ def data_from_archive(self):
 
         if self.archive.is_egg:
             archive_data['runtime_deps'] = self.runtime_deps_from_egg_info
-            archive_data['build_deps'] = [['BuildRequires', 'python2-devel'],
-                                          ['BuildRequires', 'python-setuptools']]
+            archive_data['build_deps'] = self.builtin_build_deps
+            archive_data['test_deps'] = []
         else:
             archive_data['runtime_deps'] = self.runtime_deps_from_setup_py
-            archive_data['build_deps'] = utils.unique_deps([['BuildRequires', 'python2-devel'],
-                                                            ['BuildRequires', 'python-setuptools']]
-                                                           + self.build_deps_from_setup_py)
+            archive_data['build_deps'] = self.builtin_build_deps
+            archive_data['test_deps'] = self.build_deps_from_setup_py
 
         py_vers = self.versions_from_archive
         archive_data['base_python_version'] = py_vers[0] if py_vers \
@@ -589,9 +589,8 @@ def data_from_archive(self):
          archive_data['doc_license']) = self.separate_license_files(self.doc_files)
         archive_data['has_pth'] = self.has_pth
         archive_data['runtime_deps'] = utils.unique_deps(self.runtime_deps)
-        archive_data['build_deps'] = utils.unique_deps([['BuildRequires', 'python2-devel'],
-                                                        ['BuildRequires', 'python-setuptools']]
-                                                       + self.build_deps)
+        archive_data['build_deps'] = self.builtin_build_deps
+        archive_data['test_deps'] = self.build_deps
         archive_data['py_modules'] = self.modules
         archive_data['scripts'] = self.scripts
         archive_data['has_test_suite'] = self.has_test_suite
diff --git a/pyp2rpm/templates/epel6.spec b/pyp2rpm/templates/epel6.spec
index 857c913e..38ba08c0 100644
--- a/pyp2rpm/templates/epel6.spec
+++ b/pyp2rpm/templates/epel6.spec
@@ -17,9 +17,9 @@ Source0:        {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
 {%- if not data.has_extension %}
 BuildArch:      noarch
 {%- endif %}
-{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) }}
+{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) }}
 {%- for pv in data.python_versions %}
-{{ dependencies(data.build_deps, False, pv, data.base_python_version) }}
+{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version) }}
 {%- endfor %}
 {{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version) }}
 
diff --git a/pyp2rpm/templates/epel7.spec b/pyp2rpm/templates/epel7.spec
index bfc0c314..57f2c531 100644
--- a/pyp2rpm/templates/epel7.spec
+++ b/pyp2rpm/templates/epel7.spec
@@ -14,10 +14,10 @@ Source0:        {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
 {%- if not data.has_extension %}
 BuildArch:      noarch
 {%- endif %}
-{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version,
+{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version,
 use_with=True, epel=True) }}
 {%- for pv in data.python_versions %}
-{{ dependencies(data.build_deps, False, pv, data.base_python_version,
+{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version,
 use_with=False, epel=True) }}
 {%- endfor %}
 
diff --git a/pyp2rpm/templates/fedora.spec b/pyp2rpm/templates/fedora.spec
index a330196f..7c3d194e 100644
--- a/pyp2rpm/templates/fedora.spec
+++ b/pyp2rpm/templates/fedora.spec
@@ -14,9 +14,9 @@ Source0:        {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
 {%- if not data.has_extension %}
 BuildArch:      noarch
 {%- endif %}
-{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) }}
+{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) }}
 {%- for pv in data.python_versions %}
-{{ dependencies(data.build_deps, False, pv, data.base_python_version, False) }}
+{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version, False) }}
 {%- endfor %}
 
 %description
diff --git a/pyp2rpm/templates/fedora_subdirs.spec b/pyp2rpm/templates/fedora_subdirs.spec
index e85b833d..c6aed703 100644
--- a/pyp2rpm/templates/fedora_subdirs.spec
+++ b/pyp2rpm/templates/fedora_subdirs.spec
@@ -17,9 +17,9 @@ Source0:        {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
 {%- if not data.has_extension %}
 BuildArch:      noarch
 {%- endif %}
-{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) }}
+{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) }}
 {%- for pv in data.python_versions %}
-{{ dependencies(data.build_deps, False, pv, data.base_python_version) }}
+{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version) }}
 {%- endfor %}
 {{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version) }}
 
diff --git a/pyp2rpm/templates/mageia.spec b/pyp2rpm/templates/mageia.spec
index 5fa1588e..46b06d4a 100644
--- a/pyp2rpm/templates/mageia.spec
+++ b/pyp2rpm/templates/mageia.spec
@@ -19,9 +19,9 @@ Source0:        {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
 {%- if not data.has_extension %}
 BuildArch:      noarch
 {%- endif %}
-{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) | replace("python2-devel", "python-devel") }}
+{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) | replace("python2-devel", "python-devel") }}
 {%- for pv in data.python_versions %}
-{{ dependencies(data.build_deps, False, pv, data.base_python_version)  | replace("python2-devel", "python-devel") }}
+{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version)  | replace("python2-devel", "python-devel") }}
 {%- endfor %}
 {{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version)  | replace("python2-devel", "python-devel") }}
 
diff --git a/pyp2rpm/templates/pld.spec b/pyp2rpm/templates/pld.spec
index 490886ec..087d6a9b 100644
--- a/pyp2rpm/templates/pld.spec
+++ b/pyp2rpm/templates/pld.spec
@@ -59,6 +59,9 @@ BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with python{{ pv }}}
 {{ dependencies(data.build_deps, False, pv, data.base_python_version, False) }}
 %endif
+%if %{with tests}
+{{ dependencies(data.test_deps, False, pv, data.base_python_version, False) }}
+%endif
 {%- endfor %}
 {# runtime deps for base Python version #}
 {{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version, False) }}