diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml
index d1b103e9..33b3be08 100644
--- a/.github/workflows/runtime.yml
+++ b/.github/workflows/runtime.yml
@@ -57,6 +57,12 @@ jobs:
           - os: windows-2019
             python-version: 3.9
             LC_ALL: en.UTF-8
+          - os: ubuntu-18.04
+            LC_ALL: en.UTF-8
+            python-version: pypy-3.6
+          - os: ubuntu-20.04
+            LC_ALL: C.UTF-8
+            python-version: pypy-3.7
 
     name: (Runtime) Python ${{ matrix.python-version }} -- Platform = ${{ matrix.os }} -- LC_ALL = ${{ matrix.LC_ALL }}
     steps:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 420f9730..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2020 IBM Corp. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-default:
-  image: pypy:3.6
-
-pypy3:
-  script:
-    - pip install -U -r requirements/tox.txt
-    - tox -vv -e pypy3
-
-  only:
-    - master
-    - external_pull_requests
-
-  # Allow this test to be canceled when a new commit is pushed
-  interruptible: true
diff --git a/tox.ini b/tox.ini
index c85335bc..3ad290f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38,39,py3},lint,docs
+envlist = py{36,37,38,39,py3.6,py3.7},lint,docs
 
 [testenv]
 download = True