diff --git a/ctf/pom.xml b/ctf/pom.xml
index 118b885..ad22f30 100644
--- a/ctf/pom.xml
+++ b/ctf/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.tracecompass.testtraces</groupId>
     <artifactId>tracecompass-test-traces-parent</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
   </parent>
 
   <artifactId>tracecompass-test-traces-ctf</artifactId>
diff --git a/ctf/src/main/java/org/eclipse/tracecompass/testtraces/ctf/CtfTestTrace.java b/ctf/src/main/java/org/eclipse/tracecompass/testtraces/ctf/CtfTestTrace.java
index 8824ebd..b7c004a 100644
--- a/ctf/src/main/java/org/eclipse/tracecompass/testtraces/ctf/CtfTestTrace.java
+++ b/ctf/src/main/java/org/eclipse/tracecompass/testtraces/ctf/CtfTestTrace.java
@@ -341,7 +341,35 @@
      * Trace length: 0.432 662 358 s
      * </pre>
      */
-    MANY_THREADS("/many-threads", 240644, 1);
+    MANY_THREADS("/many-threads", 240644, 1),
+
+    /**
+     * Kernel trace of the "context-switch" experiment, which tests the clock
+     * offsetting of different traces taken on the same host with different
+     * clock offsets.
+     *
+     * <pre>
+     * Trace Size: 4.6 MB
+     * Tracer: lttng-kernel 2.6.3
+     * Event count: 241 566
+     * Trace length: ~92 s
+     * </pre>
+     */
+    CONTEXT_SWITCHES_KERNEL("/context-switches/context-switches-kernel", 241566, 92),
+
+    /**
+     * Userspace trace of the "context-switch" experiment, which tests the clock
+     * offsetting of different traces taken on the same host with different
+     * clock offsets.
+     *
+     * <pre>
+     * Trace Size: 136 KB
+     * Tracer: lttng-ust 2.6.3
+     * Event count: 3934
+     * Trace length: ~49 s
+     * </pre>
+     */
+    CONTEXT_SWITCHES_UST("/context-switches/context-switches-ust", 3934, 49);
 
 
     private final String fTraceName;
diff --git a/ctf/src/main/resources/context-switches/context-switches-kernel/channel-context-switches_0 b/ctf/src/main/resources/context-switches/context-switches-kernel/channel-context-switches_0
new file mode 100644
index 0000000..d3763a8
--- /dev/null
+++ b/ctf/src/main/resources/context-switches/context-switches-kernel/channel-context-switches_0
Binary files differ
diff --git a/ctf/src/main/resources/context-switches/context-switches-kernel/metadata b/ctf/src/main/resources/context-switches/context-switches-kernel/metadata
new file mode 100644
index 0000000..7c1ad52
--- /dev/null
+++ b/ctf/src/main/resources/context-switches/context-switches-kernel/metadata
Binary files differ
diff --git a/ctf/src/main/resources/context-switches/context-switches-ust/channel0_0 b/ctf/src/main/resources/context-switches/context-switches-ust/channel0_0
new file mode 100644
index 0000000..51a1a04
--- /dev/null
+++ b/ctf/src/main/resources/context-switches/context-switches-ust/channel0_0
Binary files differ
diff --git a/ctf/src/main/resources/context-switches/context-switches-ust/metadata b/ctf/src/main/resources/context-switches/context-switches-ust/metadata
new file mode 100644
index 0000000..763100f
--- /dev/null
+++ b/ctf/src/main/resources/context-switches/context-switches-ust/metadata
Binary files differ
diff --git a/pom.xml b/pom.xml
index 1395a13..f5f5f55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 
   <groupId>org.eclipse.tracecompass.testtraces</groupId>
   <artifactId>tracecompass-test-traces-parent</artifactId>
-  <version>1.5.0</version>
+  <version>1.6.0</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/update-site/pom.xml b/update-site/pom.xml
index 018139e..7ef9a2a 100644
--- a/update-site/pom.xml
+++ b/update-site/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.tracecompass.testtraces</groupId>
     <artifactId>tracecompass-test-traces-parent</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
   </parent>
 
   <artifactId>tracecompass-test-traces-update-site</artifactId>