diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5e1c76aaf334d159ec76adefb2170638f2d7bbec..4ce5e0be3c2fd7c8e2c725cc970ecdc87cfc0387 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,4 +36,4 @@ add_custom_target( functional
 )
 
 add_executable( runner lib/runner.cpp )
-add_dependencies( functional divine llvm-utils divcc )
+add_dependencies( functional divine llvm-utils divcc dioscc )
diff --git a/test/divcc/archive-l.sh b/test/dioscc/archive-l.sh
similarity index 84%
rename from test/divcc/archive-l.sh
rename to test/dioscc/archive-l.sh
index 1814b53d7134cbe7f5437fb0ea28021f628981c3..c2beea3ee09c0925e0a7a6e670855cae8ac98f7d 100644
--- a/test/divcc/archive-l.sh
+++ b/test/dioscc/archive-l.sh
@@ -11,7 +11,7 @@ cat > foo.c <<EOF
 int foo(){ return 6; }
 EOF
 
-divcc -c foo.c
+dioscc -c foo.c
 ar r libfoo.a foo.o
 nm libfoo.a | grep "T foo"
 
@@ -25,11 +25,11 @@ int main()
 }
 EOF
 
-divcc main.c libfoo.a
+dioscc main.c libfoo.a
 ./a.out
 divine check a.out
 rm a.out
 
-divcc main.c -L. -lfoo
+dioscc main.c -L. -lfoo
 ./a.out
 divine check a.out
diff --git a/test/divcc/archive.sh b/test/dioscc/archive.sh
similarity index 87%
rename from test/divcc/archive.sh
rename to test/dioscc/archive.sh
index 5752186297847298864c898fa7e9b7c5e949d5d6..0d3a88e8931372769de3c9ebb30ea5f9a98e98e1 100644
--- a/test/divcc/archive.sh
+++ b/test/dioscc/archive.sh
@@ -19,7 +19,7 @@ int main()
 }
 EOF
 
-divcc -g -c f.c prog.c    # create object files
+dioscc -g -c f.c prog.c    # create object files
 
 if ! [ -s f.o ] || ! [ -s prog.o ];   # make sure they exist
     then false;
@@ -31,7 +31,7 @@ if ! [ -s f.a ];
     then false;
 fi
 
-divcc prog.o f.a        # fully compile
+dioscc prog.o f.a        # fully compile
 
 if [ -s linked.bc ];    # should NOT spawn linked.bc
     then false;
diff --git a/test/divcc/cmake-pthread.sh b/test/dioscc/cmake-pthread.sh
similarity index 66%
rename from test/divcc/cmake-pthread.sh
rename to test/dioscc/cmake-pthread.sh
index b50ae311e82081b436358ff9c82cae64b12470db..a2e3455712f679e5e6a9994179770835db7e7d21 100644
--- a/test/divcc/cmake-pthread.sh
+++ b/test/dioscc/cmake-pthread.sh
@@ -5,4 +5,4 @@ cmake_minimum_required( VERSION 3.2 )
 find_package( Threads REQUIRED )
 EOF
 
-cmake -DCMAKE_C_COMPILER=divcc -DCMAKE_CXX_COMPILER=divcc
+cmake -DCMAKE_C_COMPILER=dioscc -DCMAKE_CXX_COMPILER=dioscc
diff --git a/test/divcc/compile-full.sh b/test/dioscc/compile-full.sh
similarity index 94%
rename from test/divcc/compile-full.sh
rename to test/dioscc/compile-full.sh
index 5de430857d6ec124fc43debbce2300b90a21efe3..8b85e80ce8c72ee63ac16b53a830b57914607e6c 100644
--- a/test/divcc/compile-full.sh
+++ b/test/dioscc/compile-full.sh
@@ -5,7 +5,7 @@ cat > prog.c <<EOF
 int main(){}
 EOF
 
-divcc prog.c
+dioscc prog.c
 
 if ! [ -s a.out ] || ! [ -x a.out ];   # a.out exists, is non-empty and executable
     then false;
diff --git a/test/divcc/compile-only.sh b/test/dioscc/compile-only.sh
similarity index 94%
rename from test/divcc/compile-only.sh
rename to test/dioscc/compile-only.sh
index 5a437a963757f147d8325edb1f3fc81b624485d3..6559ca1cee41d2e78f503673b81dc35944649ce9 100644
--- a/test/divcc/compile-only.sh
+++ b/test/dioscc/compile-only.sh
@@ -9,7 +9,7 @@ cat > b.c <<EOF
 int foo(){}
 EOF
 
-divcc -c a.c b.c
+dioscc -c a.c b.c
 
 if ! [ -s a.c ] || ! [ -s b.c ];
     then false;
diff --git a/test/divcc/coreutils-8.31.bld b/test/dioscc/coreutils-8.31.bld
similarity index 100%
rename from test/divcc/coreutils-8.31.bld
rename to test/dioscc/coreutils-8.31.bld
diff --git a/test/divcc/divcc-o-multiple.sh b/test/dioscc/divcc-o-multiple.sh
similarity index 89%
rename from test/divcc/divcc-o-multiple.sh
rename to test/dioscc/divcc-o-multiple.sh
index 9a1931516aedd8e0cceedd7077a28e3eb68622b7..becd4161b2b56639ee5d7e4cd7437f36cf70ee97 100644
--- a/test/divcc/divcc-o-multiple.sh
+++ b/test/dioscc/divcc-o-multiple.sh
@@ -9,7 +9,7 @@ cat > empty.c <<EOF
 // nothing
 EOF
 
-divcc -o name prog.c empty.c
+dioscc -o name prog.c empty.c
 
 if [ -s a.out ] || ! [ -s name ] || ! [ -x name ];
     then false;
diff --git a/test/divcc/divcc-o.sh b/test/dioscc/divcc-o.sh
similarity index 90%
rename from test/divcc/divcc-o.sh
rename to test/dioscc/divcc-o.sh
index e90b64be5895cfffd61a3aa15df8599a4ddf8b89..8c3efb6859c74048da7249651d110395efdd7925 100644
--- a/test/divcc/divcc-o.sh
+++ b/test/dioscc/divcc-o.sh
@@ -5,7 +5,7 @@ cat > prog.c <<EOF
 int main(){}
 EOF
 
-divcc -o name prog.c
+dioscc -o name prog.c
 
 if [ -s a.out ] || ! [ -s name ] || ! [ -x name ];
     then false;
diff --git a/test/divcc/gzip-1.8.tar.xz b/test/dioscc/gzip-1.8.tar.xz
similarity index 100%
rename from test/divcc/gzip-1.8.tar.xz
rename to test/dioscc/gzip-1.8.tar.xz
diff --git a/test/divcc/gzip-O0.sh b/test/dioscc/gzip-O0.sh
similarity index 68%
rename from test/divcc/gzip-O0.sh
rename to test/dioscc/gzip-O0.sh
index f9a37098fb8b2ad8f7525c85feef30af99ff0093..0908e46852b783b4238211152704788d49c2271e 100644
--- a/test/divcc/gzip-O0.sh
+++ b/test/dioscc/gzip-O0.sh
@@ -2,9 +2,9 @@
 . lib/testcase
 
 unxz --version || skip
-unxz < $SRC_ROOT/test/divcc/gzip-1.8.tar.xz | tar x
+unxz < $SRC_ROOT/test/dioscc/gzip-1.8.tar.xz | tar x
 cd gzip-1.8
-./configure CC=divcc CFLAGS=-O0
+./configure CC=dioscc CFLAGS=-O0
 make
 echo hello world | ./gzip - > hello.gz
 divine check --stdin hello.gz ./gzip -f -d -
diff --git a/test/divcc/gzip-O1.sh b/test/dioscc/gzip-O1.sh
similarity index 68%
rename from test/divcc/gzip-O1.sh
rename to test/dioscc/gzip-O1.sh
index 2fa73f3da024ca3dc4879971ee7d58ce895d144f..075bc3bdc9e016adc752e4a0f438e4317cab5254 100644
--- a/test/divcc/gzip-O1.sh
+++ b/test/dioscc/gzip-O1.sh
@@ -2,9 +2,9 @@
 . lib/testcase
 
 unxz --version || skip
-unxz < $SRC_ROOT/test/divcc/gzip-1.8.tar.xz | tar x
+unxz < $SRC_ROOT/test/dioscc/gzip-1.8.tar.xz | tar x
 cd gzip-1.8
-./configure CC=divcc CFLAGS=-O1
+./configure CC=dioscc CFLAGS=-O1
 make
 echo hello world | ./gzip - > hello.gz
 divine check --stdin hello.gz ./gzip -f -d -
diff --git a/test/divcc/gzip-O2.sh b/test/dioscc/gzip-O2.sh
similarity index 68%
rename from test/divcc/gzip-O2.sh
rename to test/dioscc/gzip-O2.sh
index 09832c5beee681249d29eda03a6f4feb28109982..3aab662551a3a67d274837b75c79a7d56fbad59e 100644
--- a/test/divcc/gzip-O2.sh
+++ b/test/dioscc/gzip-O2.sh
@@ -2,9 +2,9 @@
 . lib/testcase
 
 unxz --version || skip
-unxz < $SRC_ROOT/test/divcc/gzip-1.8.tar.xz | tar x
+unxz < $SRC_ROOT/test/dioscc/gzip-1.8.tar.xz | tar x
 cd gzip-1.8
-./configure CC=divcc CFLAGS=-O2
+./configure CC=dioscc CFLAGS=-O2
 make
 echo hello world | ./gzip - > hello.gz
 divine check --stdin hello.gz ./gzip -f -d -
diff --git a/test/divcc/nonexistent-lib.sh b/test/dioscc/nonexistent-lib.sh
similarity index 78%
rename from test/divcc/nonexistent-lib.sh
rename to test/dioscc/nonexistent-lib.sh
index 480305efd08acd6873e00713920abdd8f85b1e9d..de9ecbef29914d1b34f90c7d8245f7a8e422b4ad 100644
--- a/test/divcc/nonexistent-lib.sh
+++ b/test/dioscc/nonexistent-lib.sh
@@ -6,7 +6,7 @@ int main()
 {}
 EOF
 
-not divcc prog.c -lxxx 2>&1 | tee file.txt
+not dioscc prog.c -lxxx 2>&1 | tee file.txt
 
 grep "unable to find library -lxxx" file.txt
 grep "lld failed, not linked" file.txt
diff --git a/test/divcc/preprocess-only.sh b/test/dioscc/preprocess-only.sh
similarity index 79%
rename from test/divcc/preprocess-only.sh
rename to test/dioscc/preprocess-only.sh
index 92231d9adbce5c715e9041893c5332d44ee461b2..7332f028589a18305bc776a080bd633572601637 100644
--- a/test/divcc/preprocess-only.sh
+++ b/test/dioscc/preprocess-only.sh
@@ -5,7 +5,7 @@ cat > prog.c <<EOF
 int main(){}
 EOF
 
-divcc -E prog.c | grep main
+dioscc -E prog.c | grep main
 
 if [ -s a.out ] || [ -s prog.o ];
     then false;
diff --git a/test/divcc/pthread.sh b/test/dioscc/pthread.sh
similarity index 84%
rename from test/divcc/pthread.sh
rename to test/dioscc/pthread.sh
index 8fc6694d0ff8681b01ba9776e474d05c43daec44..494fca49d6f0741afbea8e633d50084d35c3caa6 100644
--- a/test/divcc/pthread.sh
+++ b/test/dioscc/pthread.sh
@@ -15,7 +15,7 @@ int main()
 }
 EOF
 
-divcc prog.c -pthread
+dioscc prog.c -pthread
 
 test -s a.out
 test -x a.out
@@ -24,7 +24,7 @@ test -x a.out
 divine check a.out
 
 
-divcc prog.c -lpthread -o lpthr
+dioscc prog.c -lpthread -o lpthr
 
 test -s lpthr
 test -x lpthr
diff --git a/test/lib/build b/test/lib/build
index f6f6560197762fb65c7e70046d28f032c258fe0f..5cc91e594353f8286b096473959082b878bfc53a 100644
--- a/test/lib/build
+++ b/test/lib/build
@@ -3,6 +3,6 @@ test "$TEST_ALLOW_DOWNLOADS" = 1 || skip
 name=$(basename $1 .bld)
 curl https://divine.fi.muni.cz/test-tarballs/$name.tar.xz | unxz | tar xf -
 cd $name
-./configure CC=divcc
+./configure CC=dioscc
 make
 . $1
diff --git a/test/libc/strerror_r-divcc.sh b/test/libc/strerror_r-dioscc.sh
similarity index 87%
rename from test/libc/strerror_r-divcc.sh
rename to test/libc/strerror_r-dioscc.sh
index 80308fe590eadbffa4a9c0a5e8e33286198ad301..f6ae40f13bd7a700595bc052dca94a2a1db3ef6f 100644
--- a/test/libc/strerror_r-divcc.sh
+++ b/test/libc/strerror_r-dioscc.sh
@@ -1,4 +1,4 @@
-# TAGS: divcc
+# TAGS: dioscc
 . lib/testcase
 
 cat > strerr_gnu.c <<EOF
@@ -13,7 +13,7 @@ int main()
 }
 EOF
 
-divcc -o gnu -D_GNU_SOURCE strerr_gnu.c
+dioscc -o gnu -D_GNU_SOURCE strerr_gnu.c
 
 if [ -s a.out ] || ! [ -s gnu ] || ! [ -x gnu ];
     then false;
@@ -38,7 +38,7 @@ int main()
 }
 EOF
 
-divcc -o nognu -D_XOPEN_SOURCE strerr_nognu.c
+dioscc -o nognu -D_XOPEN_SOURCE strerr_nognu.c
 
 if [ -s a.out ] || ! [ -s nognu ] || ! [ -x nognu ];
     then false;