diff --git a/britney.conf b/britney.conf
index b6c82ed..4eb745f 100644
--- a/britney.conf
+++ b/britney.conf
@@ -92,7 +92,7 @@ CHECK_BUILDD      = no
 IMPLICIT_DEPS     = no
 
 ADT_ENABLE        = yes
-ADT_ARCHES        = amd64 i386 armhf ppc64el arm64
+ADT_ARCHES        = amd64 i386 armhf ppc64el arm64 riscv64
 ADT_AMQP          = amqp://test_request:password@autopkgtest-amqp.internal
 # space separate list of PPAs to add for test requests and for polling results;
 # the *last* one determines the swift container name
diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index a41a6f7..ffefc0d 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -841,6 +841,10 @@ class AutopkgtestPolicy(BasePolicy):
                                     pass
                             break
 
+        # Filter tests to main packages on riscv64
+        if arch == "riscv64":
+            tests = [(src, version) for (src, version) in tests if sources_info[src].component == "main"]
+
         tests.sort(key=lambda s_v: s_v[0])
         return tests
 
@@ -1500,6 +1504,8 @@ class AutopkgtestPolicy(BasePolicy):
         '''Check if src/ver/arch has a force-badtest hint'''
 
         hints = self.hints.search('force-badtest', package=src)
+        if arch == 'riscv64':
+            return True # riscv64 is force-badtested implictly
         if hints:
             self.logger.info('Checking hints for %s/%s/%s: %s', src, ver, arch, [str(h) for h in hints])
             for hint in hints: