diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index f4fa6d0a13e..42331447906 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,10 +1,10 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
-version=20130215
+version=20130216
 revision=1
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
- --enable-static --enable-debug"
+ --enable-static --enable-debug --enable-tests"
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -15,7 +15,7 @@ noextract=yes
 provides="xbps-${version}"
 replaces="xbps>=0 xbps-devel>=0"
 conf_files="/etc/xbps/xbps.conf"
-subpackages="libxbps-git libxbps-devel-git xbps-static-git"
+subpackages="libxbps-git libxbps-devel-git xbps-static-git xbps-tests-git"
 
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps"
@@ -24,16 +24,12 @@ do_fetch() {
 }
 
 depends="xbps-triggers libxbps>=${version}"
-makedepends="git which pkg-config"
-crossmakedepends="proplib-devel>=0.6.2 openssl-devel libfetch-devel
- libarchive-devel confuse-devel"
+makedepends="git which pkg-config proplib-devel openssl-devel libfetch-devel
+ libarchive-devel confuse-devel atf-devel"
 
 if [ -n "$XBPS_CROSS_TRIPLET" ]; then
-	subpackages="libxbps-git libxbps-devel-git xbps-static-git"
 	configure_script="env PKG_CONFIG_LIBDIR=/usr/${XBPS_CROSS_TRIPLET}/lib/pkgconfig ./configure"
-else
-	configure_args="${configure_args} --enable-tests"
-	makedepends="${makedepends} proplib-devel openssl-devel libarchive-devel"
-	makedepends="${makedepends} libfetch-devel confuse-devel atf-devel>=0.16"
-	subpackages="${subpackages} xbps-tests-git"
+	makedepends="git which pkg-config"
+	crossmakedepends="proplib-devel openssl-devel libfetch-devel
+			  libarchive-devel confuse-devel atf-devel"
 fi