diff --git a/mir_eval/sonify.py b/mir_eval/sonify.py
index c3b3cdd..45d059f 100644
--- a/mir_eval/sonify.py
+++ b/mir_eval/sonify.py
@@ -200,13 +200,10 @@ def time_frequency(
 
         # Create the time-varying scaling for the entire time interval by the piano roll
         # magnitude and add to the accumulating waveform.
-        # FIXME: this logic is broken when length
-        # does not match the final sample interval
-        output += wave[:length] * gram_interpolator(
-            np.arange(
-                max(sample_intervals[0][0], 0), min(sample_intervals[-1][-1], length)
-            )
-        )
+        t_in = max(sample_intervals[0][0], 0)
+        t_out = min(sample_intervals[-1][-1], length)
+        signal = gram_interpolator(np.arange(t_in, t_out))
+        output[t_in:t_out] += wave[: len(signal)] * signal
 
     # Normalize, but only if there's non-zero values
     norm = np.abs(output).max()

diff --git a/tests/test_sonify.py b/tests/test_sonify.py
index f4afeb7..b41d9a4 100644
--- a/tests/test_sonify.py
+++ b/tests/test_sonify.py
@@ -28,6 +28,8 @@ def test_time_frequency(fs):
         fs,
     )
     assert len(signal) == 10 * fs
+
+    # Make one longer
     signal = mir_eval.sonify.time_frequency(
         np.random.standard_normal((100, 1000)),
         np.arange(1, 101),
@@ -37,6 +39,16 @@ def test_time_frequency(fs):
     )
     assert len(signal) == 11 * fs
 
+    # Make one shorter
+    signal = mir_eval.sonify.time_frequency(
+        np.random.standard_normal((100, 1000)),
+        np.arange(1, 101),
+        np.linspace(0, 10, 1000),
+        fs,
+        length=fs * 5,
+    )
+    assert len(signal) == 5 * fs
+
 
 @pytest.mark.parametrize("fs", [8000, 44100])
 def test_chroma(fs):
@@ -54,8 +66,6 @@ def test_chroma(fs):
 
 
 @pytest.mark.parametrize("fs", [8000, 44100])
-# FIXME: #371
-@pytest.mark.skip(reason="Skipped until #371 is fixed")
 def test_chords(fs):
     intervals = np.array([np.arange(10), np.arange(1, 11)]).T
     signal = mir_eval.sonify.chords(

sonify.time_frequency regression
@leighsmith looks like modernizing the tests #370 surfaced a bug in the optimization of time_frequency sonification #355 

The bug only seems to show up in the chord sonification, which goes through chord→chroma and chroma→time_frequency.  It works fine when `length=None` is used, but when `length` is explicitly passed and different from the end of the last time interval, we end up with a length mismatch at
https://github.com/craffel/mir_eval/blob/57f7c31b120f6135c31207295372e3b67848126d/mir_eval/sonify.py#L190-L191 .

We didn't have this problem before #355 because the length was always precisely determined to using matching `start:end` indices for each time interval.

Since I'm in the midst of revamping all the tests, we're not really in a good place to handle this bugfix as a separate PR yet.  If there's an easy fix, I'd like to roll it into #370 so we can merge things in a passing state.  Otherwise I might mark that test as a known fail for now and we can come back to it after merging 370.
tests/test_sonify.py::test_chords[8000] tests/test_sonify.py::test_chords[44100]
tests/test_sonify.py::test_clicks[8000-times0] tests/test_sonify.py::test_clicks[8000-times1] tests/test_sonify.py::test_clicks[44100-times0] tests/test_sonify.py::test_clicks[44100-times1] tests/test_sonify.py::test_time_frequency[8000] tests/test_sonify.py::test_time_frequency[44100] tests/test_sonify.py::test_chroma[8000] tests/test_sonify.py::test_chroma[44100] tests/test_sonify.py::test_chord_x tests/test_sonify.py::test_pitch_contour