diff --git a/README.md b/README.md
index 00b5982..66276b7 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ application that automatically generates a tempest configuration appropriate for
 
 The tempest snap can be installed directly from the snap store:
 
-    sudo snap install [install-OPTIONS] tempest
+    sudo snap install [INSTALL-OPTIONS] tempest
 
 ## Compatibility matrix
 
@@ -101,28 +101,31 @@ tempest run --smoke
 For more information please refer to the [Tempest QuickStart] and [python-tempestconf] documentation.
 
 ## Test Lists
-The tempest snap provides a set of pre-defined test lists with different profiles
-and a mechanism to specify them easily.
+The tempest snap bundles a set of pre-defined test lists.
+They can be found at `/snap/tempest/current/lists/`.
 
-The `@BUILTIN_TESTLISTS` keyword will be automatically replaced by the full path
-of the directory storing the built-in test lists.
+```
+$ ls /snap/tempest/current/lists/
+readonly-quick  refstack-2022.11
 
-**Note**: the single-quotation marks around the test list file path is required
-if the `@BUILTIN_TESTLISTS` keyword is used (in other words, when running tempest
-with a built-in test list file). Failure to do so will result in a wrong path
-error.
+$ tempest run --load-list /snap/tempest/current/lists/readonly-quick
+```
 
 ### readonly-quick
 For quickly verifying the behavior of the target cloud and making sure tempest
-is correctly set up
+is correctly set up.
 
-    tempest run --load-list '@BUILTIN_TESTLISTS/readonly-quick'
+```
+tempest run --load-list /snap/tempest/current/lists/readonly-quick
+```
 
 ### refstack-2022.11
 Version 2022.11 of the [RefStack] guidelines.
 The list includes the required and advisory tests of all platforms.
 
-    tempest run --load-list '@BUILTIN_TESTLISTS/refstack-2022.11'
+```
+tempest run --load-list /snap/tempest/current/lists/refstack-2022.11
+```
 
 [OpenStack Antelope release notes - Tempest plugins]: https://releases.openstack.org/antelope/index.html#tempest-plugins
 [Tempest release notes]: https://docs.openstack.org/releasenotes/tempest/unreleased.html
diff --git a/snap/hooks/install b/snap/hooks/install
index 35897d3..87fe6aa 100644
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-if [ ! -d "${SNAP_DATA}/tempest_test_lists" ]; then
-  mkdir $SNAP_DATA/tempest_test_lists
+if [ ! -d "${SNAP_DATA}/lists" ]; then
+  mkdir $SNAP_DATA/lists
 fi
 
-cp -r $SNAP/tempest_test_lists/* $SNAP_DATA/tempest_test_lists
+cp -r $SNAP/lists/* $SNAP_DATA/lists
diff --git a/snap/hooks/post-refresh b/snap/hooks/post-refresh
index 35897d3..87fe6aa 100644
--- a/snap/hooks/post-refresh
+++ b/snap/hooks/post-refresh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-if [ ! -d "${SNAP_DATA}/tempest_test_lists" ]; then
-  mkdir $SNAP_DATA/tempest_test_lists
+if [ ! -d "${SNAP_DATA}/lists" ]; then
+  mkdir $SNAP_DATA/lists
 fi
 
-cp -r $SNAP/tempest_test_lists/* $SNAP_DATA/tempest_test_lists
+cp -r $SNAP/lists/* $SNAP_DATA/lists
diff --git a/snap/local/tempest_test_lists/readonly-quick b/snap/local/lists/readonly-quick
similarity index 100%
rename from snap/local/tempest_test_lists/readonly-quick
rename to snap/local/lists/readonly-quick
diff --git a/snap/local/tempest_test_lists/refstack-2022.11 b/snap/local/lists/refstack-2022.11
similarity index 100%
rename from snap/local/tempest_test_lists/refstack-2022.11
rename to snap/local/lists/refstack-2022.11
diff --git a/snap/local/tempest-wrapper b/snap/local/tempest-wrapper
deleted file mode 100755
index 60e2a77..0000000
--- a/snap/local/tempest-wrapper
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-args=()
-for arg in "$@"; do
-    args+=("$(printf "%s" "$arg" | sed "s|@BUILTIN_TESTLISTS|$TESTS|g")")
-done
-
-exec "${args[@]}"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 70f8011..3cef261 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,20 +10,14 @@ license: Apache-2.0
 confinement: strict
 grade: stable
 base: core22
-assumes:
-- command-chain
 apps:
   tempest:
     command: bin/tempest
-    command-chain:
-    - bin/tempest-wrapper
     completer: usr/share/bash-completion/completions/tempest
     plugs:
     - network-observe
     - network
     - home
-    environment:
-      TESTS: $SNAP_DATA/tempest_test_lists
   discover:
     command: bin/discover-tempest-config
     environment:
@@ -32,12 +26,10 @@ apps:
     - home
     - network
 parts:
-  wrapper:
+  testlists:
     plugin: dump
     source: ./snap/local
     source-type: local
-    organize:
-      tempest-wrapper: bin/tempest-wrapper
   tempest:
     plugin: python
     source: https://opendev.org/openstack/tempest.git