diff --git a/CI/aws_mc/ci_config.sh b/CI/aws_mc/ci_config.sh
new file mode 100644
index 00000000..c2adeabb
--- /dev/null
+++ b/CI/aws_mc/ci_config.sh
@@ -0,0 +1,15 @@
+# Configurable items
+TEMPDIR=$(mktemp --directory --tmpdir=/tmp  -t rfm.XXXXXXXXXX)
+TAGS="--tag CI --tag 1_node|2_nodes"
+# The hpctestlib as well as the reframe command will be based on this version
+# May be adapted later to simply use reframe from the EESSI software stack
+REFRAME_VERSION=4.3.2
+EESSI_CI_TESTSUITE_VERSION=0.1.0
+# For v0.1.0 of the test suite, EESSI_VERSION needs to match the version pointed to by the 'latest' symlink
+EESSI_VERSION=2021.12
+
+# ReFrame configuration
+export RFM_CONFIG_FILES="${TEMPDIR}/test-suite/config/aws_citc.py"
+export RFM_CHECK_SEARCH_PATH="${TEMPDIR}/test-suite/eessi/testsuite/tests/"
+export RFM_CHECK_SEARCH_RECURSIVE=1
+export RFM_PREFIX="${HOME}/reframe_CI_runs"
diff --git a/config/aws_mc.py b/config/aws_mc.py
new file mode 100644
index 00000000..6ec39bba
--- /dev/null
+++ b/config/aws_mc.py
@@ -0,0 +1,118 @@
+# WARNING: for CPU autodetect to work correctly you need to
+# 1. Either use ReFrame >= 4.3.3 or temporarily change the 'launcher' for each partition to srun
+# 2. Either use ReFrame >= 4.3.3 or run from a clone of the ReFrame repository
+
+# Without this, the autodetect job fails because
+# 1. A missing mpirun command
+# 2. An incorrect directory structure is assumed when preparing the stagedir for the autodetect job
+
+# Related issues
+# 1. https://github.com/reframe-hpc/reframe/issues/2926
+# 2. https://github.com/reframe-hpc/reframe/issues/2914
+
+import os
+
+from eessi.testsuite.common_config import common_logging_config
+from eessi.testsuite.constants import FEATURES
+
+# This config will write all staging, output and logging to subdirs under this prefix
+# Override with RFM_PREFIX environment variable
+reframe_prefix = os.path.join(os.environ['HOME'], 'reframe_runs')
+
+# This enables runtime selection of which EESSI_VERSION should be loaded. This is used e.g. in CI.
+eessi_version = os.getenv('EESSI_VERSION', 'latest')
+if eessi_version == 'latest':
+    eessi_init_script = '/cvmfs/pilot.eessi-hpc.org/latest/init/bash'
+else:
+    eessi_init_script = '/cvmfs/pilot.eessi-hpc.org/versions/%s/init/bash' % eessi_version
+
+
+# AWS CITC site configuration
+site_configuration = {
+    'systems': [
+        {
+            'name': 'citc',
+            'descr': 'Cluster in the Cloud build and test environment on AWS',
+            'modules_system': 'lmod',
+            'hostnames': ['mgmt', 'login', 'fair-mastodon*'],
+            'prefix': reframe_prefix,
+            'partitions': [
+                {
+                    'name': 'x86_64-generic-16c-30gb',
+                    'access': ['--partition=x86-64-generic-node', '--export=NONE'],
+                    'descr': 'Generic (Haswell), 16 cores, 30 GB',
+                },
+                {
+                    'name': 'x86_64-haswell-16c-30gb',
+                    'access': ['--partition=x86-64-intel-haswell-node', '--export=NONE'],
+                    'descr': 'Haswell, 16 cores, 30 GB',
+                },
+                {
+                    'name': 'x86_64-skylake-16c-30gb',
+                    'access': ['--partition=x86-64-intel-skylake-node', '--export=NONE'],
+                    'descr': 'Skylake, 16 cores, 30 GB',
+               },
+               {
+                    'name': 'x86_64-zen2-16c-30gb',
+                    'access': ['--partition=x86-64-amd-zen2-node', '--export=NONE'],
+                    'descr': 'Zen2, 16 cores, 30 GB',
+                },
+                {
+                    'name': 'x86_64-zen3-16c-30gb',
+                    'access': ['--partition=x86-64-amd-zen3-node', '--export=NONE'],
+                    'descr': 'Zen3, 16 cores, 30 GiB',
+                },
+                {
+                    'name': 'aarch64-generic-16c-32gb',
+                    'access': ['--partition=aarch64-generic-node', '--export=NONE'],
+                    'descr': 'Generic (Neoverse N1), 16 cores, 32 GB',
+                },
+                {
+                    'name': 'aarch64-neoverse-V1-16c-32gb',
+                    'access': ['--partition=aarch64-neoverse-v1-node', '--export=NONE'],
+                    'descr': 'Neoverse V1, 16 cores, 32 GB',
+                },
+                {
+                    'name': 'aarch64-neoverse-N1-16c-32gb',
+                    'access': ['--partition=aarch64-neoverse-n1-node', '--export=NONE'],
+                    'descr': 'Neoverse N1, 16 cores, 32 GiB',
+                },
+            ]
+        },
+    ],
+    'environments': [
+        {
+            'name': 'default',
+            'cc': 'cc',
+            'cxx': '',
+            'ftn': '',
+        },
+    ],
+    'logging': common_logging_config(reframe_prefix),
+    'general': [
+        {
+            # Enable automatic detection of CPU architecture for each partition
+            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
+            'remote_detect': True,
+        }
+    ],
+}
+
+# Add default things to each partition:
+partition_defaults = {
+    'scheduler': 'slurm',
+    'launcher': 'mpirun',
+    'environs': ['default'],
+    'features': [
+        FEATURES['CPU']
+    ],
+    'prepare_cmds': [
+        'source %s' % eessi_init_script,
+        # Required when using srun as launcher with --export=NONE in partition access, in order to ensure job
+        # steps inherit environment. It doesn't hurt to define this even if srun is not used
+        'export SLURM_EXPORT_ENV=ALL'
+    ],
+}
+for system in site_configuration['systems']:
+    for partition in system['partitions']:
+        partition.update(partition_defaults)