diff --git a/test/00-setup.yaml b/test/00-setup.yaml
index 5aff4be..f6d11b1 100644
--- a/test/00-setup.yaml
+++ b/test/00-setup.yaml
@@ -17,6 +17,14 @@ data:
   node.session.auth.password: VHJtK1lZaXZvMUNZSGszcGFGVWMrcTdCMmdJPQo=
 ---
 apiVersion: v1
+kind: Secret
+metadata:
+  namespace: demo
+  name: with-envfrom-secret
+data:
+  title: dmVyeXNlY3JldA==
+---
+apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: demo-pv
@@ -82,6 +90,39 @@ spec:
   name: restore-pg
   image: desmo999r/formolcli:latest
   args: ["postgres", "restore", "--hostname", $(PGHOST), "--database", $(PGDATABASE), "--username", $(PGUSER), "--password", $(PGPASSWD), "--file", "/output/backup-pg.sql"]
+  env:
+    - name: PGHOST
+      value: postgres
+    - name: PGDATABASE
+      value: demopostgres
+    - name: PGUSER
+      value: demopostgres
+    - name: PGPASSWD
+      value: password123!
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: with-envfrom
+  namespace: demo
+spec:
+  name: with-envfrom
+  command: ["touch", $(title)]
+  envFrom:
+    - secretRef:
+        name: with-envfrom-secret
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: with-env
+  namespace: demo
+spec:
+  name: with-env
+  command: ["touch", $(TESTFILE)]
+  env:
+    - name: TESTFILE
+      value: /data/testfile
 ---
 apiVersion: formol.desmojim.fr/v1alpha1
 kind: Function
@@ -92,6 +133,15 @@ spec:
   name: backup-pg
   image: desmo999r/formolcli:latest
   args: ["postgres", "backup", "--hostname", $(PGHOST), "--database", $(PGDATABASE), "--username", $(PGUSER), "--password", $(PGPASSWD), "--file", "/output/backup-pg.sql"]
+  env:
+    - name: PGHOST
+      value: postgres
+    - name: PGDATABASE
+      value: demopostgres
+    - name: PGUSER
+      value: demopostgres
+    - name: PGPASSWD
+      value: password123!
 ---
 apiVersion: formol.desmojim.fr/v1alpha1
 kind: Function
diff --git a/test/02-backupconf.yaml b/test/02-backupconf.yaml
index 166e255..f037c82 100644
--- a/test/02-backupconf.yaml
+++ b/test/02-backupconf.yaml
@@ -15,6 +15,8 @@ spec:
     name: nginx-deployment
     steps:
       - name: maintenance-on
+      - name: with-env
+      - name: with-envfrom
       - name: maintenance-off
         finalize: true
     volumeMounts:
@@ -22,19 +24,10 @@ spec:
         mountPath: /data
     paths:
       - /data
-  - kind: Job
-    name: backup-pg
-    steps:
-      - name: backup-pg
-        env:
-          - name: PGHOST
-            value: postgres
-          - name: PGDATABASE
-            value: demopostgres
-          - name: PGUSER
-            value: demopostgres
-          - name: PGPASSWD
-            value: password123!
+#  - kind: Job
+#    name: backup-pg
+#    steps:
+#      - name: backup-pg
   keep:
     last: 5
     daily: 2
diff --git a/test/README b/test/README
index abc00e5..a6874fb 100644
--- a/test/README
+++ b/test/README
@@ -1 +1,2 @@
 NAMESPACE=demo; for i in $(kubectl -n $NAMESPACE get bs | awk 'NR>1 { print $1 }'); do kubectl -n $NAMESPACE get bs -o json $i | sed '/finalizers/,+2d' | curl -vvv -X PUT -H 'Content-type: application/json' -d @- http://127.0.0.1:8001/apis/formol.desmojim.fr/v1alpha1/namespaces/$NAMESPACE/backupsessions/$i; kubectl -n $NAMESPACE delete bs $i; done
+NAMESPACE=demo; for i in $(kubectl -n $NAMESPACE get bs | awk 'NR>1 { if ($3 == "New") { print $1 }}'); do kubectl -n $NAMESPACE get bs -o json $i | sed '/finalizers/,+2d' | curl -vvv -X PUT -H 'Content-type: application/json' -d @- http://127.0.0.1:8001/apis/formol.desmojim.fr/v1alpha1/namespaces/$NAMESPACE/backupsessions/$i; kubectl -n $NAMESPACE delete bs $i; done