diff --git a/tests.toml b/tests.toml
index 2d300eb..acca843 100644
--- a/tests.toml
+++ b/tests.toml
@@ -2,37 +2,38 @@ test_format = 1.0
 
 [default]
 
+    exclude = ["install.private"]
+
     # -------------------------------
     # Default args to use for install
     # -------------------------------
-    
-    args.export = "libreoffice"
+
+    args.export = "none"
     args.mypads = 0
     args.useldap = 0
-    args.password = "admin!42"
+    args.password = "##SuperAdminPassword##"
 
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.4d613658.name = "Upgrade from 1.8.17"
+    test_upgrade_from.4d613658.name = "1.8.17"
 
 
-# This is an additional test suite
 [with_mypads]
     args.export = "libreoffice"
     args.mypads = 1
     args.useldap = 1
     only = ["install.root"]
 
-#[with_abiword]
-#    args.export = "abiword"
-#    args.mypads = 1
-#    args.useldap = 1
-#    only = ["install.root"]
+[with_abiword]
+    args.export = "libreoffice"
+    args.mypads = 0
+    args.useldap = 0
+    only = ["install.root"]
 
-#[without_export]
-#    args.export = "none"
-#    args.mypads = 1
-#    args.useldap = 0
-#    only = ["install.root"]
+[with_libreoffice]
+    args.export = "libreoffice"
+    args.mypads = 0
+    args.useldap = 0
+    only = ["install.root"]