diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04852253..0490b493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Documentation for hipCUB is available at
 
 ### Added
 * Add support for large indices in `hipcub::DeviceSegmentedReduce::*`. rocPRIM's backend provides support for all reduce variants, but CUB's does not have support yet for `DeviceSegmentedReduce::Arg*`, so large indices support has been excluded for these as well in hipCUB.
-
+* Add -t smoke option in rtest.py. It will run a subset of tests such that the total test time is in 5 minutes. Use python3 ./rtest.py --test smoke or python3 ./rtest.py -t smoke to execute smoke test.
 ### Changed
 * The NVIDIA backend now requires CUB, Thrust and libcu++ 2.3.2. If it is not found it will be downloaded from the NVIDIA CCCL repository.
 
diff --git a/rtest.xml b/rtest.xml
index b14d0171..a12363cb 100644
--- a/rtest.xml
+++ b/rtest.xml
@@ -2,10 +2,14 @@
 <testset failure-regex="[1-9]\d* tests failed">
   <var name="CTEST_FILTER" value="ctest --output-on-failure --exclude-regex"></var>
   <var name="CTEST_REGEX" value="&quot;(hipcub.Grid)&quot;"></var>
+  <var name="SMOKE_TEST" value="env GTEST_FILTER=-'*HipcubBlockShuffleTests/1.BlockUp*:*HipcubBlockShuffleTests/1.BlockDown*:*HipcubBlockShuffleTests/2.BlockUp*:*HipcubBlockShuffleTests/2.BlockDown*:*HipcubBlockShuffleTests/3.BlockUp*:*HipcubBlockShuffleTests/3.BlockDown*:*HipcubBlockShuffleTests/6.BlockUp*:*HipcubBlockShuffleTests/6.BlockDown*:*HipcubBlockShuffleTests/7.BlockUp*:*HipcubBlockShuffleTests/7.BlockDown*:*HipcubBlockShuffleTests/9.BlockUp*:*HipcubBlockShuffleTests/9.BlockDown*:*HipcubBlockShuffleTests/10.BlockUp*:*HipcubBlockShuffleTests/10.BlockDown*:*HipcubBlockShuffleTests/12.BlockUp*:*HipcubBlockShuffleTests/12.BlockDown*:*HipcubBlockShuffleTests/13.BlockUp*:*HipcubBlockShuffleTests/13.BlockDown*:*HipcubBlockShuffleTests/14.BlockUp*:*HipcubBlockShuffleTests/14.BlockDown*:*HipcubBlockShuffleTests/15.BlockUp*:*HipcubBlockShuffleTests/15.BlockDown*:*HipcubBlockShuffleTests/16.BlockUp*:*HipcubBlockShuffleTests/16.BlockDown*:*HipcubDeviceAdjacentDifference/3.SubtractLeftCopy*:*HipcubDeviceAdjacentDifference/4.SubtractLeftCopy*:*HipcubDeviceAdjacentDifference/5.SubtractLeftCopy*:*HipcubDeviceAdjacentDifference/6.SubtractLeftCopy*:*HipcubDeviceAdjacentDifferenceLargeTests/0.LargeIndicesAndOpOnce*:*HipcubDeviceAdjacentDifferenceLargeTests/1.LargeIndicesAndOpOnce*:*HipcubDeviceAdjacentDifferenceLargeTests/2.LargeIndicesAndOpOnce*:*HipcubDeviceAdjacentDifferenceLargeTests/3.LargeIndicesAndOpOnce*:*DeviceBatchCopyTests/8.SizeAndTypeVariation*:*HipcubDeviceHistogramRange/5.Range*:*HipcubDeviceHistogramRange/7.Range*:*HipcubDeviceHistogramMultiEven/0.MultiEven*:*HipcubDeviceHistogramMultiEven/2.MultiEven*:*HipcubDeviceHistogramMultiEven/4.MultiEven*:*HipcubDeviceHistogramMultiEven/5.MultiEven*:*HipcubDeviceHistogramMultiEven/7.MultiEven*:*HipcubDeviceHistogramMultiEven/8.MultiEven*:*HipcubDeviceHistogramMultiEven/9.MultiEven*:*HipcubDeviceHistogramMultiEven/10.MultiEven*:*HipcubDeviceHistogramMultiEven/11.MultiEven*:*HipcubDeviceHistogramMultiRange/0.MultiRange*:*HipcubDeviceHistogramMultiRange/3.MultiRange*:*HipcubDeviceHistogramMultiRange/4.MultiRange*:*HipcubDeviceHistogramMultiRange/5.MultiRange*:*HipcubDeviceHistogramMultiRange/6.MultiRange*:*HipcubDeviceHistogramMultiRange/7.MultiRange*:*HipcubDeviceHistogramMultiRange/8.MultiRange*:*DeviceBatchMemcpyTests/8.SizeAndTypeVariation*:*HipcubDeviceMergeSort/12.SortKeys*:*HipcubDeviceMergeSort/12.SortKeysCopy*:*HipcubDeviceMergeSort/12.StableSortKeys*:*HipcubDeviceMergeSort/12.StableSortKeysCopy*:*HipcubDeviceMergeSort/12.SortPairs*:*HipcubDeviceMergeSort/12.SortPairsCopy*:*HipcubDeviceMergeSort/12.StableSortPairs*:*HipcubDeviceRadixSort.SortKeysOver4G*:*Id84/HipcubDeviceRadixSort/0.SortKeys*:*Id84/HipcubDeviceRadixSort/0.SortPairs*:*Id84/HipcubDeviceRadixSort/0.SortKeysDoubleBuffer*:*Id84/HipcubDeviceRadixSort/0.SortPairsDoubleBuffer*:*Id88/HipcubDeviceRadixSort/0.SortKeys*:*Id88/HipcubDeviceRadixSort/0.SortPairs*:*Id88/HipcubDeviceRadixSort/0.SortKeysDoubleBuffer*:*Id88/HipcubDeviceRadixSort/0.SortPairsDoubleBuffer*:*HipcubDeviceRunLengthEncode/0.NonTrivialRuns*:*HipcubDeviceReduceByKey/0.ReduceByKey*:*HipcubDeviceReduceByKey/1.ReduceByKey*:*HipcubDeviceReduceByKey/2.ReduceByKey*:*HipcubDeviceReduceByKey/3.ReduceByKey*:*HipcubDeviceReduceByKey/10.ReduceByKey*:*HipcubDeviceReduceByKey/13.ReduceByKey*:*HipcubDeviceReduceByKey/14.ReduceByKey*:*Id53/HipcubDeviceSegmentedRadixSort/0.SortPairs*:*HipcubDeviceSegmentedReduceOp/7.Reduce*:*HipcubDeviceSegmentedReduce/4.Min*:*HipcubDeviceSegmentedReduce/4.ArgMin*:*HipcubDeviceSegmentedReduce/5.ArgMin*:*HipcubDeviceUniqueByKeyTests/1.UniqueByKey*:*HipcubDeviceUniqueByKeyTests/3.UniqueByKey*:*HipcubDevicePartitionTests/0.Flagged*:*HipcubDevicePartitionTests/0.If*:*HipcubDevicePartitionTests/0.IfThreeWay*:*HipcubDevicePartitionTests/1.Flagged*:*HipcubDevicePartitionTests/1.If*:*HipcubDevicePartitionTests/1.IfThreeWay*:*HipcubDevicePartitionTests/2.Flagged*:*HipcubDevicePartitionTests/2.If*:*HipcubDevicePartitionTests/2.IfThreeWay*:*HipcubDevicePartitionTests/3.Flagged*:*HipcubDevicePartitionTests/3.If*:*HipcubDevicePartitionTests/3.IfThreeWay*:*HipcubDevicePartitionTests/4.Flagged*:*HipcubDevicePartitionTests/4.If*:*HipcubDevicePartitionTests/4.IfThreeWay*:*HipcubDevicePartitionTests/5.Flagged*:*HipcubDevicePartitionTests/5.If*:*HipcubDevicePartitionTests/5.IfThreeWay*:*HipcubDeviceSegmentedReduceLargeIndicesTests.LargeIndices*' ctest"></var>
   <test sets="psdb">
     <run name="all_tests">{CTEST_FILTER} {CTEST_REGEX}</run>
   </test>
   <test sets="osdb">
     <run name="all_tests">{CTEST_FILTER} {CTEST_REGEX}</run>
   </test>
+  <test sets="smoke">
+    <run name="smoke_tests">{SMOKE_TEST}</run>
+  </test>
 </testset>
\ No newline at end of file