diff --git a/.github/workflows/test-master.yml b/.github/workflows/test-master.yml
deleted file mode 100644
index e1bf080a..00000000
--- a/.github/workflows/test-master.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Test Master
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: build-essential cmake postgresql-server-dev-14 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
-          version: 1.0
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install MEOS
-        run: |
-          git clone https://github.com/MobilityDB/MobilityDB
-          mkdir MobilityDB/build
-          cd MobilityDB/build
-          cmake .. -DMEOS=on
-          make -j
-          sudo make install
-      - name: Install python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r pymeos_cffi/dev-requirements.txt
-          pip install -r pymeos/dev-requirements.txt
-      - name: Install pymeos_cffi
-        run: |
-          cd pymeos_cffi
-          python ./pymeos_cffi/builder/build_header.py
-          python ./pymeos_cffi/builder/build_pymeos_functions.py
-          pip install .
-          cd ..
-      - name: Test PyMEOS with pytest
-        run: |
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-          cd pymeos
-          pytest
diff --git a/.github/workflows/test-develop.yml b/.github/workflows/test.yml
similarity index 77%
rename from .github/workflows/test-develop.yml
rename to .github/workflows/test.yml
index 900f5411..9e0b37e4 100644
--- a/.github/workflows/test-develop.yml
+++ b/.github/workflows/test.yml
@@ -1,10 +1,10 @@
-name: Test Develop
+name: Test PyMEOS
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "develop", "master" ]
   pull_request:
-    branches: [ "develop" ]
+    branches: [ "develop", "master" ]
 
 jobs:
   build:
@@ -16,18 +16,24 @@ jobs:
         python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: build-essential cmake postgresql-server-dev-14 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
           version: 1.0
+
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: "pip"
+
       - name: Install MEOS
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         run: |
-          git clone --branch develop https://github.com/MobilityDB/MobilityDB
+          git clone --branch ${{ env.BRANCH_NAME }} --depth 1 https://github.com/MobilityDB/MobilityDB
           mkdir MobilityDB/build
           cd MobilityDB/build
           cmake .. -DMEOS=on
diff --git a/pymeos/pyproject.toml b/pymeos/pyproject.toml
index 04365dae..02cd7e6b 100644
--- a/pymeos/pyproject.toml
+++ b/pymeos/pyproject.toml
@@ -19,7 +19,6 @@ classifiers = [
     'Programming Language :: C',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
@@ -32,7 +31,7 @@ classifiers = [
 readme = 'README.md'
 license = { file = 'LICENSE' }
 
-requires-python = '>=3.7'
+requires-python = '>=3.8'
 dependencies = [
     'pymeos-cffi >=1.1.0, <2',
     'python-dateutil',
diff --git a/pymeos_cffi/pyproject.toml b/pymeos_cffi/pyproject.toml
index d8c8cb76..01678641 100644
--- a/pymeos_cffi/pyproject.toml
+++ b/pymeos_cffi/pyproject.toml
@@ -20,7 +20,6 @@ classifiers = [
     'Programming Language :: C',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
@@ -33,7 +32,7 @@ classifiers = [
 readme = 'README.md'
 license = { file = 'LICENSE' }
 
-requires-python = '>=3.7'
+requires-python = '>=3.8'
 dependencies = [
     'cffi',
     'python-dateutil',