diff --git a/docker-compose.yml b/docker-compose.yml
index fb4afcbf..6999d4b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,26 +16,18 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-fedora31:
+  test-fedora36:
     build:
       context: .
-      dockerfile: test/docker/fedora31
+      dockerfile: test/docker/fedora36
     network_mode: "host"
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-fedora32:
+  test-fedora37:
     build:
       context: .
-      dockerfile: test/docker/fedora32
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
-  test-fedora33:
-    build:
-      context: .
-      dockerfile: test/docker/fedora33
+      dockerfile: test/docker/fedora37
     network_mode: "host"
     security_opt:
       - label=type:container_runtime_t
diff --git a/test/docker/fedora33 b/test/docker/fedora33
deleted file mode 100644
index 33f601fd..00000000
--- a/test/docker/fedora33
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM fedora:33
-
-RUN dnf update -y
-RUN dnf install -y \
-        asciidoctor \
-        cmake \
-        findutils \
-        gcc-c++ \
-        glibc-locale-source \
-        git \
-        make \
-        man \
-        python3 \
-        python3-dateutil
-
-# Setup environment
-RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
-RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
-
-# Setup timewarrior
-ADD . /root/code/
-WORKDIR /root/code/
-RUN git clean -dfx
-RUN git submodule init
-RUN git submodule update
-RUN cmake -DCMAKE_BUILD_TYPE=debug .
-RUN make -j2
-RUN make install
-
-# Setup tests
-RUN make -j2 test || true
-WORKDIR /root/code/test/
-CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"]
diff --git a/test/docker/fedora31 b/test/docker/fedora36
similarity index 98%
rename from test/docker/fedora31
rename to test/docker/fedora36
index c01bbe8d..12af318c 100644
--- a/test/docker/fedora31
+++ b/test/docker/fedora36
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:36
 
 RUN dnf update -y
 RUN dnf install -y \
diff --git a/test/docker/fedora32 b/test/docker/fedora37
similarity index 98%
rename from test/docker/fedora32
rename to test/docker/fedora37
index 78790a98..1e749bfb 100644
--- a/test/docker/fedora32
+++ b/test/docker/fedora37
@@ -1,4 +1,4 @@
-FROM fedora:32
+FROM fedora:37
 
 RUN dnf update -y
 RUN dnf install -y \