diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1e2f57a8..c1ecb5add 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
       - main
   pull_request:
     branches:
-      - main
+      - [main, openasip-2.2]
   workflow_dispatch:
 
 jobs:
@@ -111,6 +111,10 @@ jobs:
           cd openasip
           python3 ./tools/scripts/install_qemu.py $HOME/qemu-openasip
 
+      - name: oa-selftest
+        run: |
+          oa-selftest -v -f
+
       - name: Unit tests
         run: |
           cd openasip/test
diff --git a/openasip/scripts/oa-selftest b/openasip/scripts/oa-selftest
index 9187f767f..f4b9cef62 100755
--- a/openasip/scripts/oa-selftest
+++ b/openasip/scripts/oa-selftest
@@ -365,20 +365,20 @@ class TestExplorer(TCETestCase):
         takes a while!)
         """
         # Generate .idf using the ImplementationSelector plugin
-        command = 'explore -e ImplementationSelector -a {0} -s1 test.dsdb'.format(self.get_minimalADF())
+        command = 'explore -v -e ImplementationSelector -a {0} -s1 test.dsdb'.format(self.get_minimalADF())
         (timeout, stdout, stderr, code) = self.runWithTimeout(command, 120)
-        self.assertTrue('Best result configurations:' in stdout)
-        self.assertTrue('2' in stdout)
-        self.assertEqual(stderr.strip(), '')
+        self.assertTrue('Best result configurations:' in stderr)
+        self.assertTrue('2' in stderr)
+        self.assertEqual(stdout.strip(), '')
         self.assertEqual(code, 0)
 
         # Dump the .idf a file.
         (timeout, stdout, stderr, code) = self.runWithTimeout(
-            'explore -w 2 test.dsdb', 120)
-        self.assertEqual(stderr.strip(), '')
+            'explore -v -w 2 test.dsdb', 120)
+        self.assertEqual(stdout.strip(), '')
         self.assertEqual(code, 0)
-        self.assertTrue('Written ADF file of configuration 2' in stdout)
-        self.assertTrue('Written IDF file of configuration 2' in stdout)
+        self.assertTrue('Written ADF file of configuration 2' in stderr)
+        self.assertTrue('Written IDF file of configuration 2' in stderr)
         self.assertTrue(os.path.exists('2.adf'))
         self.assertTrue(os.path.exists('2.idf'))
 
@@ -483,21 +483,21 @@ class TestEstimator(TCETestCase):
         """
 
         # Generate .idf using explorer
-        command = 'explore -e ImplementationSelector -a {0} -s 1 test.dsdb'.format(self.get_bigEndianMinimalADF())
+        command = 'explore -v -e ImplementationSelector -a {0} -s 1 test.dsdb'.format(self.get_bigEndianMinimalADF())
         (timeout, stdout, stderr, code) = self.runWithTimeout(command, 120)
-        self.assertTrue('Best result configurations:' in stdout)
-        self.assertTrue('2' in stdout)
-        self.assertEqual(stderr.strip(), '')
+        self.assertTrue('Best result configurations:' in stderr)
+        self.assertTrue('2' in stderr)
+        self.assertEqual(stdout.strip(), '')
         self.assertEqual(code, 0)
 
         # Dump the .idf a file.
         (timeout, stdout, stderr, code) = self.runWithTimeout(
-            'explore -w 2 test.dsdb', 60
+            'explore -v -w 2 test.dsdb', 60
         )
-        self.assertEqual(stderr.strip(), '')
+        self.assertEqual(stdout.strip(), '')
         self.assertEqual(code, 0)
-        self.assertTrue('Written ADF file of configuration 2' in stdout)
-        self.assertTrue('Written IDF file of configuration 2' in stdout)
+        self.assertTrue('Written ADF file of configuration 2' in stderr)
+        self.assertTrue('Written IDF file of configuration 2' in stderr)
         self.assertTrue(os.path.exists('2.adf'))
         self.assertTrue(os.path.exists('2.idf'))
 
@@ -547,21 +547,21 @@ class TestProGeAndPIG(TCETestCase):
         """
 
         # Generate .idf using the ImplementationSelector plugin
-        command = 'explore -e ImplementationSelector -a {0} -s1 test.dsdb'.format(
+        command = 'explore -v -e ImplementationSelector -a {0} -s1 test.dsdb'.format(
             self.get_minimalADF())
         (timeout, stdout, stderr, code) = self.runWithTimeout(command, 120)
-        self.assertTrue('Best result configurations:' in stdout)
-        self.assertTrue('2' in stdout)
-        self.assertEqual(stderr.strip(), '')
+        self.assertTrue('Best result configurations:' in stderr)
+        self.assertTrue('2' in stderr)
+        self.assertEqual(stdout.strip(), '')
         self.assertEqual(code, 0)
 
         # Dump the .idf a file.
         (timeout, stdout, stderr, code) = self.runWithTimeout(
-            'explore -w 2 test.dsdb', 120)
-        self.assertEqual(stderr.strip(), '')
+            'explore -v -w 2 test.dsdb', 120)
+        self.assertEqual(stdout.strip(), '')
         self.assertEqual(code, 0)
-        self.assertTrue('Written ADF file of configuration 2' in stdout)
-        self.assertTrue('Written IDF file of configuration 2' in stdout)
+        self.assertTrue('Written ADF file of configuration 2' in stderr)
+        self.assertTrue('Written IDF file of configuration 2' in stderr)
         self.assertTrue(os.path.exists('2.adf'))
         self.assertTrue(os.path.exists('2.idf'))
 
diff --git a/testsuite/systemtest_long/procgen/RFGen/tcetest_rfgen.sh b/testsuite/systemtest_long/procgen/RFGen/tcetest_rfgen.sh
index ece25c3c2..f0df696ab 100755
--- a/testsuite/systemtest_long/procgen/RFGen/tcetest_rfgen.sh
+++ b/testsuite/systemtest_long/procgen/RFGen/tcetest_rfgen.sh
@@ -69,7 +69,7 @@ function run_verilog_test() {
 
     # If iverilog is found from PATH, compile and simulate
     IVERILOG=$(which iverilog 2> /dev/null)
-    if [ "x${GHDL}" != "x" ]
+    if [ "x${IVERILOG}" != "x" ]
     then
         cd $PROGE_OUT || exit 1
         ./iverilog_compile.sh >& /dev/null || echo "iverilog compile failed."