diff --git a/apertis-ospack.yaml b/apertis-ospack.yaml
index e697fa8b0af944c1e57769af5b7364b70cc44dc1..c4860fb97d7aadec8e77abd06e5c742a125bc8f2 100644
--- a/apertis-ospack.yaml
+++ b/apertis-ospack.yaml
@@ -6,6 +6,8 @@
 {{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s.tar.gz" $suite $architecture $type $timestamp) -}}
 {{- $demopack := or .demopack "disabled" -}}
 
+{{- $tests := or .tests "disabled" -}}
+
 architecture: {{ $architecture }}
 
 actions:
@@ -67,6 +69,7 @@ actions:
     packages:
       - connman
       - wpasupplicant
+      - curl
 
   - action: apt
     description: "AppArmor packages"
@@ -81,13 +84,6 @@ actions:
       - newport
       - ribchester-core
 
-  - action: apt
-    description: "Test environment packages"
-    packages:
-      - net-tools
-      - openssh-client
-      - openssh-server
-      - vim.tiny
 
   {{- if eq $type "target" "development" "sdk" }}
   - action: apt
@@ -147,7 +143,6 @@ actions:
       - iproute
       - iptables
       - kmod
-      - libegl1-mesa-drivers
       - libgupnp-1.0-4
       - liblockfile-bin
       - libnss-myhostname
diff --git a/apertis-ostree-commit.yaml b/apertis-ostree-commit.yaml
index aed45d14bc00deacc6a716f29c6cb765eb709319..dafc81bb031365cc797a94efb665fbef9b25390e 100644
--- a/apertis-ostree-commit.yaml
+++ b/apertis-ostree-commit.yaml
@@ -9,6 +9,9 @@
 {{ $ostreelocal := or .ostreelocal "repo" }}
 {{ $message := or .message "Update" }}
 
+{{ $tests := or .tests "disable" }}
+{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
+
 architecture: {{ $architecture }}
 
 actions:
@@ -36,6 +39,123 @@ actions:
       # as soon as merged "/usr" will be introduced
       - ostree
 
+  {{ if ne $tests "disable" }}
+  - action: run
+    chroot: true
+    script: scripts/apt_source.chroot -m {{ $mirror }} -r {{ $suite }} development
+
+  - action: apt
+    description: "Test environment packages"
+    packages:
+      - net-tools
+      - openssh-client
+      - openssh-server
+      - vim.tiny
+
+  - action: apt
+    description: "Packages for bluez test"
+    packages:
+      - chaiwala-tests
+
+  - action: apt
+    description: "Packages for tests"
+    packages:
+      - apertis-tests
+      - apertis-tests-apparmor-dbus
+      - apertis-tests-apparmor-geoclue
+      - apertis-tests-apparmor-goals
+      - apertis-tests-apparmor-gstreamer1.0
+      - apertis-tests-apparmor-pulseaudio
+      - apertis-tests-apparmor-report
+      - apertis-tests-apparmor-tracker
+      - apertis-tests-apparmor-tumbler
+      - apertis-tests-bin
+      - apparmor
+      - apparmor-demo
+      - apparmor-profiles
+      - apparmor-tests
+      - apparmor-utils-tests
+      - bash
+      - build-essential
+      - busybox
+      - canterbury
+      - canterbury-dev
+      - canterbury-tests
+      - chaiwala-apparmor-profiles
+      - chaiwala-test-media
+      - chaiwala-tests
+      - cpuburn
+      - curl
+      - dbus
+      - dbus-dbgsym
+      - dbus-tests
+      - dbus-tests-dbgsym
+      - devscripts
+      - didcot-tests
+      - dpkg-dev
+      - evolution-data-server
+      - folks-tools
+      - frome-tests
+      - gettext
+      - gir1.2-grilo-0.2
+      - gir1.2-gst-plugins-base-1.0
+      - gir1.2-gstreamer-1.0
+      - gir1.2-tracker-1.0
+      - gnome-desktop-testing
+      - grilo-plugins-0.2
+      - libbredon-0-tests
+      - libcroesor-0-dev
+      - libcroesor-0-tests
+      - libdbus-1-3-dbgsym
+      - libfolks-eds25
+      - libfolks-ofono25
+      - libfolks-telepathy25
+      - libglib2.0-bin
+      - libglib2.0-tests
+      - libgupnp-1.0-tests
+      - liblightwood-dev
+      - libmildenhall-0-dev
+      - librest-0.7-tests
+      - librhosydd-0-dev
+      - librhosydd-0-tests
+      - libshoreham-0-tests
+      - libsoup2.4-tests
+      - libsqlite3-tests
+      - libthornbury-0-dev
+      - libthornbury-dev
+      - libtraprain-0-tests
+      - make
+      - mildenhall-dev
+      - mktemp
+      - newport-tests
+      - ofono-tests
+      - perl-doc
+      - policykit-1
+      - procps
+      - python3
+      - python3-dbus
+      - python3-debian
+      - python3-gi
+      - rhosydd-tests
+      - rhosydd-tools
+      - ribchester
+      - ribchester-dev
+      - ribchester-tests
+      - ribchester-tools
+      - ruby
+      - syncevolution
+      - telepathy-gabble
+      - telepathy-mission-control-5
+      - telepathy-phoenix
+      - telepathy-ring
+      - tracker
+      - tumbler
+      - uuid-runtime
+      - webkit2gtk-testing
+      - wget
+  {{ end }}
+
+
   - action: run
     description: Cleanup /var/lib
     script: scripts/remove_var_lib_parts.binary