diff --git a/tests/perf/benchmark.py b/tests/perf/benchmark.py
index 2b49b3f39..27766fd98 100644
--- a/tests/perf/benchmark.py
+++ b/tests/perf/benchmark.py
@@ -12,7 +12,7 @@ class BenchmarkBasicApi(RemoteGefUnitTestGeneric):
     def benchmark(self, benchmark):
         self.__benchmark = benchmark
 
-    @pytest.mark.benchmark
+    @pytest.mark.benchmark(warmup=True)
     def test_cmd_context(self):
         gdb = self._gdb
         gdb.execute("start")
@@ -23,7 +23,6 @@ def test_gef_memory_maps(self):
         gdb = self._gdb
         gdb.execute("start")
         gef = self._gef
-        assert self.__benchmark
 
         def vmmap():
             return gef.memory.maps
@@ -35,5 +34,4 @@ def test_elf_parsing(self):
         root = self._conn.root
         ElfCls = root.eval("Elf")
         assert ElfCls
-        assert self.__benchmark
         self.__benchmark(ElfCls, "/bin/ls")
diff --git a/tests/perf/context_times.sh b/tests/perf/context_times.sh
deleted file mode 100755
index 80c70adc0..000000000
--- a/tests/perf/context_times.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-
-# Bail out early on an unexpected error
-set -e
-
-time_gef_context() {
-    gdb -ex 'start' \
-	-ex 'pi import profile' \
-	-ex 'pi reset_all_caches()' \
-	-ex "pi profile.run(\"gdb.execute('context')\", sort=\"cumtime\")" \
-	-ex 'quit' \
-        /tmp/pattern.out 2>&1 | get_context_time
-}
-
-get_context_time() {
-    grep "gdb.execute('context')" | tr -s ' ' | cut -d ' ' -f 5
-}
-
-log_this_revision() {
-    rev=$(git log -1 --pretty="format:%h")
-    printf "%s" "$rev"
-    title=$(git log -1 --pretty="format:%s")
-    printf ",\"%s\"" "$title"
-    for _ in $(seq 1 5); do
-        rv=$($1)
-        printf ",%s" "$rv"
-    done
-    printf "\n"
-}
-
-log_command() {
-    log_this_revision "$1" >> stats.csv
-}
-
-clear_stats() {
-    if [ -e "stats.csv" ]; then
-        rm stats.csv
-    fi
-}
-
-get_current_branch_or_commit() {
-    b=$(git branch | grep '\* ')
-    case "$b" in
-        *HEAD*)
-            echo "$b" | tr -d ')' | cut -f 5 -d ' ';;
-        *)
-            echo "$b" | cut -f 2 -d ' ';;
-    esac
-}
-
-run_on_git_revisions() {
-    start_ref=$1
-    end_ref=$2
-    test_command=$3
-
-    orig_rev=$(get_current_branch_or_commit)
-    revs=$(git rev-list --reverse "${start_ref}".."${end_ref}")
-
-    for rev in $revs; do
-        echo "Checking out: $(git log --oneline -1 "$rev")"
-        git checkout --quiet "$rev"
-        log_command "$test_command"
-        git reset --hard --quiet
-    done
-
-    echo "Restoring original commit/branch: $orig_rev"
-    git checkout --quiet "$orig_rev"
-}
-
-if [ $# == "2" ]; then
-    clear_stats
-    run_on_git_revisions "$1" "$2" "time_gef_context"
-else
-    echo "usage: $0 first_commit last_commit"
-fi