diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index ed02ee6..bdba624 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -24,6 +24,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install flake8 pytest-cov
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        make docker-pull
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
@@ -32,4 +33,4 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        docker pull bash && docker pull openjdk && docker pull php && docker pull ruby && pytest --cov=.
+        pytest --cov=.
diff --git a/.travis.yml b/.travis.yml
index 5ebb7b3..e346229 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,20 +17,7 @@ before_install:
 install:
   - make pip
   - pip install -U flake8 pylint pytest-cov codecov
-  - docker pull gcc:4.8  # For gcc & g++
-  - docker pull gcc:4.9  # For gccgo
-  - docker pull golang:1  # For go
-  - docker pull python:3  # For python3
-  - docker pull python:2  # For python2
-  - docker pull pypy:3  # For pypy3
-  - docker pull pypy:2  # For pypy2
-  - docker pull node:12  # For node
-  - docker pull openjdk  # For javac and java
-  - docker pull clangbuiltlinux/ubuntu:llvm10-latest  # For clang-10 & clang++-10
-  - docker pull clangbuiltlinux/ubuntu:llvm11-latest  # For clang-11 & clang++-11
-  - docker pull bash  # For bash
-  - docker pull php  # For php
-  - docker pull ruby  # For ruby
+  - make docker-pull
 script:
   - make lint
   - make pytest
diff --git a/Makefile b/Makefile
index 2178411..be68ce7 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,10 @@ pytest:
 	pytest --cov=dockerjudge
 
 
+docker-pull:
+	sh docker-pull.sh
+
+
 lint: flake8 pylint
 
 flake8:
diff --git a/docker-pull.sh b/docker-pull.sh
new file mode 100644
index 0000000..e27ba78
--- /dev/null
+++ b/docker-pull.sh
@@ -0,0 +1,15 @@
+docker pull bash  # For bash
+docker pull clangbuiltlinux/ubuntu:llvm10-latest  # For clang-10 & clang++-10
+docker pull clangbuiltlinux/ubuntu:llvm11-latest  # For clang-11 & clang++-11
+docker pull gcc:4.8  # For gcc & g++
+docker pull gcc:4.9  # For gccgo
+docker pull golang:1  # For go
+docker pull mono  # For csc, vbnc & mono
+docker pull node:12  # For node
+docker pull openjdk  # For javac and java
+docker pull php  # For php
+docker pull pypy:3  # For pypy3
+docker pull pypy:2  # For pypy2
+docker pull python:3  # For python3
+docker pull python:2  # For python2
+docker pull ruby  # For ruby