diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index b6f9d12..fb2eae6 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -113,11 +113,13 @@
 
   <Group name="bcfg2tmp0" profile="true">
     <Group name="crans"/>
+    <Group name="test"/>
   </Group>
 
   <Group name="bcfg2tmp1" profile="true">
     <Group name="crans"/>
     <Group name="mail-mx-secondary"/>
+    <Group name="test"/>
   </Group>
 
   <!-- +=================+ -->
diff --git a/Python/etc/bcfg2.conf b/Python/etc/bcfg2.conf
new file mode 100644
index 0000000..986aec7
--- /dev/null
+++ b/Python/etc/bcfg2.conf
@@ -0,0 +1,28 @@
+# -*- coding: utf-8; mode: python -*-
+
+include("secrets")
+
+header("Fichier de configuration de bcfg2")
+
+if has("bcfg2-server"):
+    @[server]
+    %repository = "/var/lib/bcfg2"
+    %structures = "Bundler,Base"
+    %generators = "SSHbase,Cfg,TGenshi,Rules,Python"
+    %svn = "no"
+
+@[statistics]
+%sendmailpath = "/usr/sbin/sendmail"
+
+@[communication]
+%protocol = "xmlrpc/ssl"
+%password = secrets.bcfg2_password
+%key = "/etc/bcfg2.key"
+%fingerprint = "2f110783f4cbd14e45a35de518ddbaea999a03ad"
+%agent-port = 6790
+
+@[components]
+if has("test"):
+    %bcfg2 = "https://vert.adm.crans.org:6789"
+else:
+    %bcfg2 = "https://bcfg2tmp1.adm.crans.org:6789"
diff --git a/TGenshi/etc/bcfg2.conf/info.xml b/TGenshi/etc/bcfg2.conf/info.xml
deleted file mode 100644
index 0c1af3e..0000000
--- a/TGenshi/etc/bcfg2.conf/info.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<FileInfo>
-  <Info owner="root" group="root" perms="0600"/>
-</FileInfo>
diff --git a/TGenshi/etc/bcfg2.conf/template.txt b/TGenshi/etc/bcfg2.conf/template.txt
deleted file mode 100644
index 3fd7c4d..0000000
--- a/TGenshi/etc/bcfg2.conf/template.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8; mode: conf-unix -*-
-#
-# Fichier gere par BCfg2
-#
-# Fichier de configuration de bcfg2.
-{% include /var/lib/bcfg2/etc/genshi/utils.txt %}\
-{% include /var/lib/bcfg2/etc/genshi/secrets.txt %}\
-
-{% if has("bcfg2-server") %}\
-[server]
-repository = /var/lib/bcfg2
-structures = Bundler,Base
-generators = SSHbase,Cfg,TGenshi,Rules,Python
-svn=no
-{% end %}\
-
-[statistics]
-sendmailpath = /usr/sbin/sendmail
-
-[communication]
-protocol = xmlrpc/ssl
-password = $bcfg2_password
-key = /etc/bcfg2.key
-fingerprint = 2f110783f4cbd14e45a35de518ddbaea999a03ad
-agent-port = 6790
-
-[components]
-bcfg2 = https://vert.adm.crans.org:6789