diff --git a/litex/soc/cores/cpu/cva6/core.py b/litex/soc/cores/cpu/cva6/core.py
index bef9404b3..fe0691dbb 100644
--- a/litex/soc/cores/cpu/cva6/core.py
+++ b/litex/soc/cores/cpu/cva6/core.py
@@ -71,6 +71,7 @@ class CVA6(CPU):
     def gcc_flags(self):
         flags = GCC_FLAGS[self.variant]
         flags += "-D__cva6__ "
+        flags += f" -DUART_POLLING"
         return flags
 
     # Memory Mapping.
diff --git a/test/test_cpu.py b/test/test_cpu.py
index 02047107b..63e2feac2 100644
--- a/test/test_cpu.py
+++ b/test/test_cpu.py
@@ -56,6 +56,9 @@ class TestCPU(unittest.TestCase):
     def test_picorv32(self):
         self.assertTrue(self.boot_test("picorv32"))
 
+    def test_cva6(self):
+        self.assertTrue(self.boot_test("cva6"))
+
     # OpenRISC CPUs.
     #def test_mor1kx(self):
     #    self.assertTrue(self.boot_test("mor1kx"))