diff --git a/ceph.spec.in b/ceph.spec.in
index 08d77451a1e..3a36ab2259e 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -109,11 +109,6 @@ BuildRequires:	boost-devel
 BuildRequires:  cmake
 BuildRequires:	cryptsetup
 BuildRequires:	fuse-devel
-%if 0%{?suse_version}
-BuildRequires:	python-Cython
-%else
-BuildRequires:	Cython
-%endif
 BuildRequires:	gdbm
 BuildRequires:	hdparm
 BuildRequires:	leveldb-devel > 1.2
@@ -157,15 +152,22 @@ BuildRequires:	libbz2-devel
 %if 0%{with tcmalloc}
 BuildRequires:	gperftools-devel
 %endif
+%if 0%{with tests}
+BuildRequires:  btrfsprogs
+%endif
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	keyutils-devel
 BuildRequires:	libatomic-ops-devel
 BuildRequires:  lsb-release
+BuildRequires:	python-Cython
 %endif
 %if 0%{?fedora} || 0%{?rhel} 
 %if 0%{?_with_systemd}
 Requires:	systemd
 %endif
+%if 0%{with tests}
+BuildRequires:	btrfs-progs
+%endif
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 BuildRequires:	libatomic_ops-devel
@@ -174,6 +176,7 @@ Requires(preun):	chkconfig
 Requires(preun):	initscripts
 BuildRequires:	gperftools-devel
 BuildRequires:  redhat-lsb-core
+BuildRequires:	Cython
 %endif
 # boost
 %if 0%{?fedora} || 0%{?rhel} 
@@ -210,6 +213,10 @@ BuildRequires:	python-sphinx10
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7
 BuildRequires:	python-sphinx
 %endif
+#hardened-cc1
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:  redhat-rpm-config
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed storage system that runs
diff --git a/debian/control b/debian/control
index 10671829ebf..899a9356c6f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Uploaders: Ken Dreyer <kdreyer@redhat.com>,
 Build-Depends: autoconf,
                automake,
                autotools-dev,
+               btrfs-tools,
 	       cmake,
                cpio,
 	       cryptsetup-bin | cryptsetup,