diff --git a/apparmor/apparmor-tracker.yaml b/apparmor/apparmor-tracker.yaml
index 111c894d640829904ff02d5e18715539e4be6d83..717fa56268f0b88c8a70190f03bac8beb273cfd9 100644
--- a/apparmor/apparmor-tracker.yaml
+++ b/apparmor/apparmor-tracker.yaml
@@ -21,7 +21,7 @@ install:
 run:
   steps:
   - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --name run-test-tracker --timeout 3000 /usr/lib/apertis-tests/apparmor/tracker/test-tracker
+  - common/run-test-in-systemd --name run-test-tracker --timeout 3000 apparmor/tracker/test-tracker
   - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
diff --git a/apparmor/tracker/test-tracker b/apparmor/tracker/test-tracker
index 4758c314a43255eb5ee3878f5a6156cad3e6c205..d66b3db8d6b55f25efc9f2a2a456b3f83571572e 100755
--- a/apparmor/tracker/test-tracker
+++ b/apparmor/tracker/test-tracker
@@ -3,7 +3,7 @@
 
 set -x
 
-TEST_DIR="${TEST_DIR:-/usr/lib/apertis-tests/apparmor/tracker}"
+TEST_DIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 # We want to use the pre-existing session bus.
 export LAUNCH_DBUS="no"
 export RUN_AA_TEST_TIMEOUT="2500s"
diff --git a/apparmor/tracker/tracker b/apparmor/tracker/tracker
index d8dde93d59524374998a87cc21fa543e16dcc270..054fe61e73a00b7d1df9c1b36aafcba66787c1b6 100755
--- a/apparmor/tracker/tracker
+++ b/apparmor/tracker/tracker
@@ -10,10 +10,12 @@ fi
 
 export APERTIS_TESTS_NAME_PREFIX="${1}_"
 
+TEST_DIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
+
 if [[ $1 == "malicious" ]]; then
     LD_PRELOAD="/usr/lib/apertis-tests/apparmor/tracker/libtracker-malicious-override.so" \
-    DEBUG=2 /usr/share/chaiwala-tests/tracker/automated/run-test.sh
+    $TEST_DIR/../../tracker/automated/test-tracker.py
 else
-    DEBUG=2 /usr/share/chaiwala-tests/tracker/automated/run-test.sh
+    $TEST_DIR/../../tracker/automated/test-tracker.py
 fi
 
diff --git a/apparmor/tracker/tracker.malicious.expected b/apparmor/tracker/tracker.malicious.expected
index 8d3043ee7138da46ca4ac996ff062bfafb57462b..2a433bf8a33c7e42bb04b13689f424c376742293 100644
--- a/apparmor/tracker/tracker.malicious.expected
+++ b/apparmor/tracker/tracker.malicious.expected
@@ -5,171 +5,3 @@ denied_mask:r
 operation:open
 name:/home/user/.bash_history
 request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
-====
-profile:/usr/bin/tracker-control
-sdmode:REJECTING
-denied_mask:r
-operation:open
-name:/home/user/.bash_history
-request_mask:r
diff --git a/common/tracker-configuration.yaml b/common/tracker-configuration.yaml
deleted file mode 100644
index a85670f5dfb6a5e4e42e50d140ab57faf8f3ffed..0000000000000000000000000000000000000000
--- a/common/tracker-configuration.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-metadata:
-  name: tracker-configuration
-  format: "Lava-Test-Shell Test Definition 1.0"
-  description: "Check if tracker indexing is configured properly."
-  maintainer: "luis.araujo@collabora.co.uk"
-  scope:
-  - functional
-  devices:
-  - i386
-  environment:
-  - lava-test-shell
-
-install:
-  deps:
-  - chaiwala-tests
-
-run:
-  steps:
-    - common/run-test-in-systemd --basename --timeout=900 --user=user /usr/share/chaiwala-tests/tracker-configuration/automated/run-test.sh
-
-parse:
-  pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$
diff --git a/common/tracker-indexing-local-storage.yaml b/common/tracker-indexing-local-storage.yaml
index 00293a0e1ec9c23bd8b0427c526bb0d1e5e5311c..6e6befa14d15981fc295f38dfb812698a7a8daa4 100644
--- a/common/tracker-indexing-local-storage.yaml
+++ b/common/tracker-indexing-local-storage.yaml
@@ -12,12 +12,12 @@ metadata:
 
 install:
   deps:
-  - chaiwala-tests
+  - apertis-tests
   - tracker-utils
 
 run:
   steps:
-    - common/run-test-in-systemd --user=user --name=run-test --timeout=900 env DEBUG=2 /usr/share/chaiwala-tests/tracker/automated/run-test.sh
+    - common/run-test-in-systemd --user=user --name=run-test --timeout=900 tracker/automated/test-tracker.py
 
 parse:
   pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$
diff --git a/debian/control b/debian/control
index e2c40383477112ffe21e1d9ea62b3824ff5c04d9..e820d855cd96337dda71ac7f42a21f11b8084ff1 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,10 @@ Vcs-Git: https://git.apertis.org/git/apertis-tests.git
 
 Package: apertis-tests
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         gir1.2-grilo-0.2,
+         gir1.2-tracker-1.0
+
 Description: automated and manual test definitions
  This package installs test scripts, test data and other pieces of
  automated and manual tests.
@@ -134,7 +137,6 @@ Depends:
  apparmor (>= 2.8.0-0ubuntu5co4),
  apparmor-profiles,
  chaiwala-apparmor-profiles,
- chaiwala-tests,
  tracker (>= 0.14.1),
  tracker-utils,
 Description: Functional tests for Tracker AppArmor profiles/abstractions
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 1beec7e63cda9dd136071e4846231de0d3a1ef41..1e02455cd4b8297a71c517ab450d0fdfc49ba94f 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -364,24 +364,6 @@
         ]
       }
     },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1000,
-        "testdef_repos": [
-          {
-            "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
-            "revision": "master",
-            "testdef": "common/sanity-check.yaml"
-          },
-          {
-            "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
-            "revision": "master",
-            "testdef": "common/tracker-configuration.yaml"
-          }
-        ]
-      }
-    },
     {
       "command": "lava_test_shell",
       "parameters": {
diff --git a/tracker/automated/README b/tracker/automated/README
index 6c7eac0c21e6cc65da61b4d62b7079958543cf54..404e21d00a287be0d93f90fa753728e506deeda3 100644
--- a/tracker/automated/README
+++ b/tracker/automated/README
@@ -2,10 +2,3 @@ This test purges all tracker DBs and config when it runs!
 
 Do not run this on a system where you care about tracker data.
 
-Debug output variables:
-
-* DEBUG=1 will make the script show stdout
-* DEBUG=2 will make the script show stderr+stdout
-* G_MESSAGES_DEBUG=all will make the test program and tracker show g_debug msgs
- + Note: this will interfere with programs that read stdout output to verify
-   that the test completed successfully