diff --git a/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java b/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
index 639b9db34e9b1cc19a6d0c6a04be1767d2de4cdb..52c0491f1017f0fe2d666d84f27093a5036b85a3 100644
--- a/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
+++ b/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
@@ -47,7 +47,7 @@ public class ToFloatArray {
         for (int big = 0; big < 2; big+=1)
         for (int bits = 32; bits <= 64; bits+=32) {
             AudioFormat frm = new AudioFormat(
-                    AudioFloatConverter.PCM_FLOAT,
+                    AudioFormat.Encoding.PCM_FLOAT,
                     44100, bits, 1, bits/8,
                     44100, big==1);
             byte[] buff = new byte[testarray.length * frm.getFrameSize()];
diff --git a/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java b/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java
index ae8ea108971c6b7c9eb9ff6fa99de90512b1ecdd..9f3ff0c956ab3d4c13e17d456ac1d334d94f1835 100644
--- a/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java
+++ b/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java
@@ -84,16 +84,16 @@ public class DummySourceDataLine implements SourceDataLine {
                         AudioSystem.NOT_SPECIFIED, bits, channels, channels
                                 * bits / 8, AudioSystem.NOT_SPECIFIED, true));
             }
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, true));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, true));
         }
diff --git a/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java b/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java
index ae8ea108971c6b7c9eb9ff6fa99de90512b1ecdd..9f3ff0c956ab3d4c13e17d456ac1d334d94f1835 100644
--- a/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java
+++ b/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java
@@ -84,16 +84,16 @@ public class DummySourceDataLine implements SourceDataLine {
                         AudioSystem.NOT_SPECIFIED, bits, channels, channels
                                 * bits / 8, AudioSystem.NOT_SPECIFIED, true));
             }
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, true));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, true));
         }