diff --git a/apparmor/bluez/R1.13a.1_bluez-core.sh b/apparmor/bluez/R1.13a.1_bluez-core.sh
index 4692951fc5a4bc5ad81fb10c2667da0b6b819281..0f4a9e97da0399e4ed57c96ad74cc4f99f44bf05 100755
--- a/apparmor/bluez/R1.13a.1_bluez-core.sh
+++ b/apparmor/bluez/R1.13a.1_bluez-core.sh
@@ -7,6 +7,4 @@ else
     exit 1
 fi
 
-test -z "$DISPLAY" && DISPLAY=:0
-
 sudo "/usr/lib/chaiwala-tests/bluez/bluez-test"
diff --git a/apparmor/bluez/R1.13a.1_bluez-spp.sh b/apparmor/bluez/R1.13a.1_bluez-spp.sh
index 2a5a87bec94ab274b6d97c73294b1eb08b56898a..4f6aea54762cdcc4fe1567165d41f11a85e17b8d 100755
--- a/apparmor/bluez/R1.13a.1_bluez-spp.sh
+++ b/apparmor/bluez/R1.13a.1_bluez-spp.sh
@@ -7,6 +7,4 @@ else
     exit 1
 fi
 
-test -z "$DISPLAY" && DISPLAY=:0
-
 /usr/lib/chaiwala-tests/bluez/spp-test.sh
diff --git a/apparmor/folks/R6.4.2_folks-metacontacts-antilinking.sh b/apparmor/folks/R6.4.2_folks-metacontacts-antilinking.sh
index 25023893aa64e9d732efb05fe6e9fb586e9d7968..3a53438ca750afedc0c0a384128a2c18fa073c20 100755
--- a/apparmor/folks/R6.4.2_folks-metacontacts-antilinking.sh
+++ b/apparmor/folks/R6.4.2_folks-metacontacts-antilinking.sh
@@ -12,6 +12,4 @@ else
     exit 1
 fi
 
-test -z "$DISPLAY" && DISPLAY=:0
-
 ${TEST_DIR}/../../folks/folks-metacontacts-antilinking.sh
diff --git a/clutter-i18n/manual/run-test.sh b/clutter-i18n/manual/run-test.sh
index f28b53d8b0a9fb35f8515eee8d5ef3eea86130ad..5971c34567e4dc3a83a3e8365414111a3e0f34a9 100755
--- a/clutter-i18n/manual/run-test.sh
+++ b/clutter-i18n/manual/run-test.sh
@@ -1 +1 @@
-DISPLAY=:0 LANG=de_DE.utf8 /usr/lib/chaiwala-tests/clutter-i18n/manual/test-clutter-i18n
+LANG=de_DE.utf8 /usr/lib/chaiwala-tests/clutter-i18n/manual/test-clutter-i18n
diff --git a/folks/create-abstract-sync-database.sh b/folks/create-abstract-sync-database.sh
index 7334aad8fdfbfd44ebcede26e91c0caf01aba506..f4267ff8f273567ab9bf3f80229e9c62f5ce0f7c 100755
--- a/folks/create-abstract-sync-database.sh
+++ b/folks/create-abstract-sync-database.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 database=`uuidgen`
 
 # Create abstract database
diff --git a/folks/folks-alias-persistence.sh b/folks/folks-alias-persistence.sh
index 236341f1104d3c36594a4e62cecf2363382b19f7..ce2ead20d0c61b18a9646bf411cccb4e28be3c9f 100755
--- a/folks/folks-alias-persistence.sh
+++ b/folks/folks-alias-persistence.sh
@@ -5,10 +5,6 @@ echo "# running test: $0"
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 mkdir -p ~/.local/share/folks
diff --git a/folks/folks-eds-compatibility.sh b/folks/folks-eds-compatibility.sh
index cff28219e1d6a1d235f5da9962dfba2433ccfb31..9b5ee65bf71741221c6669ffa653e4319c40a39b 100755
--- a/folks/folks-eds-compatibility.sh
+++ b/folks/folks-eds-compatibility.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 # Remove all contacts from eds.
diff --git a/folks/folks-extended-info.sh b/folks/folks-extended-info.sh
index 846ada195c87ed30bf2490a16766d20d4c36a1d6..70264782c4ac9e830add3f53ceecb03427b90b54 100755
--- a/folks/folks-extended-info.sh
+++ b/folks/folks-extended-info.sh
@@ -7,10 +7,7 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 
 set -x
 
-export DISPLAY=:0
 export FOLKS_DEBUG_NO_COLOUR=1
 export G_MESSAGES_DEBUG=all
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
 
 exec /usr/lib/chaiwala-tests/contacts/folks-extended-info
diff --git a/folks/folks-metacontacts-antilinking.sh b/folks/folks-metacontacts-antilinking.sh
index 1c649a408cb41dab792fc4fcbf0c7deb1142a3d4..164a33b874a4dce44a604a95fabee1edf250ecf5 100755
--- a/folks/folks-metacontacts-antilinking.sh
+++ b/folks/folks-metacontacts-antilinking.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 # Clean up to make sure we have a good test.
diff --git a/folks/folks-metacontacts-linking.sh b/folks/folks-metacontacts-linking.sh
index 17df5bf5d77e4feb8d0178c9ff4bc01aa2473b8f..6b0ee8c87816d46e28d068efdc2b156b2c657cbe 100755
--- a/folks/folks-metacontacts-linking.sh
+++ b/folks/folks-metacontacts-linking.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 # Clean up to make sure we have a good test.
diff --git a/folks/folks-metacontacts-unlinking.sh b/folks/folks-metacontacts-unlinking.sh
index 2861ae402d4f30c23c6da6a5d9f985035125a1c6..53639f7aff46df5334bd67253247e369e5653367 100755
--- a/folks/folks-metacontacts-unlinking.sh
+++ b/folks/folks-metacontacts-unlinking.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 # Clean up to make sure we have a good test.
diff --git a/folks/folks-ofonotest.sh b/folks/folks-ofonotest.sh
index e54bc725207a4107a5ee223a2283911958749ec6..c6c572a7fbbd4fa4ec229c889c2a66af46e15eb2 100755
--- a/folks/folks-ofonotest.sh
+++ b/folks/folks-ofonotest.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 mkdir -p ~/.local/share/folks
diff --git a/folks/folks-retrieve-contacts-telepathy.sh b/folks/folks-retrieve-contacts-telepathy.sh
index cfd87389aa2eb403f341a46dff938f68c66f3ba4..0c17ae47e2974bf974d96251ec215453bb5b46b2 100755
--- a/folks/folks-retrieve-contacts-telepathy.sh
+++ b/folks/folks-retrieve-contacts-telepathy.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 mkdir -p ~/.local/share/folks
diff --git a/folks/folks-search-contacts.sh b/folks/folks-search-contacts.sh
index 1e24884853ea4f9dbbab866172d69cff3b75ccd2..de367c72b358e3e196437ed5abb97bfec3de10d9 100755
--- a/folks/folks-search-contacts.sh
+++ b/folks/folks-search-contacts.sh
@@ -8,10 +8,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 # Debuggability
 set -x
 
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-export DISPLAY=:0
-
 cur_dir=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 
 mkdir -p ~/.local/share/folks
diff --git a/folks/folks-sync-only.sh b/folks/folks-sync-only.sh
index 99296fddc7742d29d78bac2a46f56f252bd70d67..1420861e14fabee1419074cd668293b5ef7e4b53 100755
--- a/folks/folks-sync-only.sh
+++ b/folks/folks-sync-only.sh
@@ -9,10 +9,6 @@ env | LC_ALL=C sort | sed -e 's/^/#  /'
 set -x
 set -e
 
-export DISPLAY=:0
-export XDG_RUNTIME_DIR=/run/user/$(id -u user)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-
 BACKUP_FILES=""
 PROCESSES_TO_KILL=""
 
diff --git a/sdk/telepathy-ring-automated.sh b/sdk/telepathy-ring-automated.sh
index ed90d76a7dcf5a33be6fc19e57830e56e8082c8a..4099a1d26947a67fc7bdd5160e90191fbb942ae2 100755
--- a/sdk/telepathy-ring-automated.sh
+++ b/sdk/telepathy-ring-automated.sh
@@ -7,13 +7,6 @@ echo "# $0: running in: $(pwd)"
 echo "# $0: initial environment:"
 env | LC_ALL=C sort | sed -e 's/^/#  /'
 
-export DISPLAY=:0
-export XDG_RUNTIME_DIR=/run/user/$(id -u user)
-
-echo "# $0: additional environment:"
-echo "#  DISPLAY=$DISPLAY"
-echo "#  XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR"
-
 set -x
 
 BACKUP_FILES=""
diff --git a/x-out-of-screen-events/buttond_tester.sh b/x-out-of-screen-events/buttond_tester.sh
index f1acdc84bfe053cd1e78098f7d0501616de7b86d..eb51915ddbf8c28a609799da124988b0e634d92a 100755
--- a/x-out-of-screen-events/buttond_tester.sh
+++ b/x-out-of-screen-events/buttond_tester.sh
@@ -18,10 +18,6 @@ set -x
 set -e
 set -o pipefail
 
-export DISPLAY=:0
-export XDG_RUNTIME_DIR=/run/user/$(id -u user)
-export DBUS_SESSION_BUS_ADDRESS=unix:path="$XDG_RUNTIME_DIR/bus"
-
 /usr/lib/chaiwala-tests/x-out-of-screen-events/input_generator 2>&1 | sed -e 's/^/# input_generator:  /' &
 sleep 2
 buttond /usr/share/chaiwala-tests/x-out-of-screen-events/buttond_tester.conf 2>&1 | sed -e 's/^/# buttond:  /' &