diff --git a/src/OMSimulatorLib/SystemSC.cpp b/src/OMSimulatorLib/SystemSC.cpp
index 0c72d8f86..4376adf0d 100644
--- a/src/OMSimulatorLib/SystemSC.cpp
+++ b/src/OMSimulatorLib/SystemSC.cpp
@@ -881,6 +881,15 @@ oms_status_enu_t oms::SystemSC::doStepCVODE()
{
const fmi3Float64 tout = std::min(tnext, end_time);
+ // CVode rejects an interval it cannot tell apart from zero (CV_TOO_CLOSE)
+ // There is nothing left to integrate in it; assume end_time is reached.
+ if (tout - time < 2.0 * SUN_UNIT_ROUNDOFF * std::max(std::fabs(time), std::fabs(tout)))
+ {
+ logDebug("CVode: skipping degenerate interval " + std::to_string(time) + " -> " + std::to_string(tout));
+ time = end_time;
+ break;
+ }
+
logDebug("CVode: " + std::to_string(time) + " -> " + std::to_string(tout));
for (size_t j=0, k=0; j < fmus.size(); ++j)
for (size_t i=0; i < nStates[j]; ++i, ++k)
diff --git a/testsuite/tests/resources/CMakeLists.txt b/testsuite/tests/resources/CMakeLists.txt
index 11b735086..33b0927d1 100644
--- a/testsuite/tests/resources/CMakeLists.txt
+++ b/testsuite/tests/resources/CMakeLists.txt
@@ -12,6 +12,7 @@ set(OM_OMS_TESTSUITE_RESOURCES_FMUS
${CMAKE_CURRENT_SOURCE_DIR}/B
${CMAKE_CURRENT_SOURCE_DIR}/BouncingBall
${CMAKE_CURRENT_SOURCE_DIR}/BouncingBall3
+ ${CMAKE_CURRENT_SOURCE_DIR}/ClockedStepBoundary
${CMAKE_CURRENT_SOURCE_DIR}/Dahlquist
${CMAKE_CURRENT_SOURCE_DIR}/Dahlquist3
${CMAKE_CURRENT_SOURCE_DIR}/DualMassOscillator.System1
diff --git a/testsuite/tests/resources/ClockedStepBoundary.mos b/testsuite/tests/resources/ClockedStepBoundary.mos
new file mode 100644
index 000000000..ea2d6384f
--- /dev/null
+++ b/testsuite/tests/resources/ClockedStepBoundary.mos
@@ -0,0 +1,13 @@
+// Regenerates testsuite/resources/ClockedStepBoundary.
+//
+// A clocked model: Modelica.Clocked drives it from periodic clocks whose tick
+// times are computed exactly (k * period), while a master stepping the FMU
+// accumulates its own communication points. The two disagree by an ULP once the
+// accumulated end of a communication step lands just past a tick, which is what
+// the clockedStepBoundary test exercises.
+
+loadModel(Modelica, {"4.0.0"}); getErrorString();
+
+buildModelFMU(Modelica.Clocked.Examples.CascadeControlledDrive.AbsoluteClocks, version="2.0", fmuType="me", fileNamePrefix="ClockedStepBoundary", platforms={"x86_64-linux-gnu docker run multiarch/crossbuild","x86_64-w64-mingw32 docker run multiarch/crossbuild"}); getErrorString();
+
+system("zip -qd ClockedStepBoundary.fmu sources/* && unzip -o ClockedStepBoundary.fmu -d ClockedStepBoundary/");
diff --git a/testsuite/tests/resources/ClockedStepBoundary/binaries/linux64/ClockedStepBoundary.so b/testsuite/tests/resources/ClockedStepBoundary/binaries/linux64/ClockedStepBoundary.so
new file mode 100755
index 000000000..b36b89020
Binary files /dev/null and b/testsuite/tests/resources/ClockedStepBoundary/binaries/linux64/ClockedStepBoundary.so differ
diff --git a/testsuite/tests/resources/ClockedStepBoundary/documentation/index.html b/testsuite/tests/resources/ClockedStepBoundary/documentation/index.html
new file mode 100644
index 000000000..2a1397266
--- /dev/null
+++ b/testsuite/tests/resources/ClockedStepBoundary/documentation/index.html
@@ -0,0 +1,14 @@
+
+Modelica.Clocked.Examples.CascadeControlledDrive.AbsoluteClocks
+ Drive with clocked cascade controller where all partitions are defined with exact (integer) clock that need to be compatible to each other
+ Information
+
+Cascade control drive with discrete-time controller where two
+periodic clock with absolute periods are defined and
+are associated to
+the corresponding controller partitions.
+The super-sampling factor of block "super" is derived by
+clock inference.
+
+
+ Revisions
diff --git a/testsuite/tests/resources/ClockedStepBoundary/modelDescription.xml b/testsuite/tests/resources/ClockedStepBoundary/modelDescription.xml
new file mode 100644
index 000000000..f5e3aa1c9
--- /dev/null
+++ b/testsuite/tests/resources/ClockedStepBoundary/modelDescription.xml
@@ -0,0 +1,830 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+