diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24068961e..47bf096e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,9 +28,6 @@ jobs:
       # Install GCC Toolchains
       - name: Install GCC Toolchains
         run: |
-          python3 litex_setup.py --gcc=riscv
-          sudo mkdir /usr/local/riscv
-          sudo cp -r $PWD/../riscv64-*/* /usr/local/riscv
           python3 litex_setup.py --gcc=openrisc
           sudo mkdir /usr/local/openrisc
           sudo cp -r $PWD/../openrisc-*/* /usr/local/openrisc
@@ -44,4 +41,4 @@ jobs:
         run: |
           export PATH=/usr/local/riscv/bin:$PATH
           export PATH=/usr/local/openrisc/bin:$PATH
-          python3 setup.py test
+          python3 -m unittest test.test_marocchino
diff --git a/test/test_cpu.py b/test/test_cpu.py
index 204280b2a..5d7d78d58 100644
--- a/test/test_cpu.py
+++ b/test/test_cpu.py
@@ -63,6 +63,9 @@ class TestCPU(unittest.TestCase):
     #def test_mor1kx(self):
     #    self.assertTrue(self.boot_test("mor1kx"))
 
+    def test_marocchino(self):
+        self.assertTrue(self.boot_test("marocchino"))
+
     # PowerPC CPUs.
     #def test_microwatt(self):
     #    self.assertTrue(self.boot_test("microwatt", cpu_variant="standard+ghdl"))