diff --git a/celt/celt.h b/celt/celt.h
index 112f6f29521b7d8fcbc021a0caad6793cce89b5c..ad1c1d847c20171810f9d6523e56e95e190fc40f 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -66,6 +66,10 @@ typedef struct {
 
 /* Encoder/decoder Requests */
 
+/* Expose this option again when variable framesize actually works */
+#define OPUS_FRAMESIZE_VARIABLE              5010 /**< Optimize the frame size dynamically */
+
+
 #define CELT_SET_PREDICTION_REQUEST    10002
 /** Controls the use of interframe prediction.
     0=Independent frames
diff --git a/include/opus_defines.h b/include/opus_defines.h
index af371b4424afc1b59692d6a01dea92a758474001..c39a60e317b887d2183c83a1e1e5d2be3419d64b 100644
--- a/include/opus_defines.h
+++ b/include/opus_defines.h
@@ -206,7 +206,6 @@ extern "C" {
 #define OPUS_FRAMESIZE_20_MS                 5004 /**< Use 20 ms frames */
 #define OPUS_FRAMESIZE_40_MS                 5005 /**< Use 40 ms frames */
 #define OPUS_FRAMESIZE_60_MS                 5006 /**< Use 60 ms frames */
-#define OPUS_FRAMESIZE_VARIABLE              5010 /**< Optimize the frame size dynamically */
 
 /**@}*/
 
diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c
index fa1dabe705ceb05eccd83043d849013b794d83a8..6cbd2fa501d455d2e5db3b45f52e6d4b34841b18 100644
--- a/tests/test_opus_api.c
+++ b/tests/test_opus_api.c
@@ -1374,7 +1374,7 @@ opus_int32 test_enc_api(void)
    if(err!=OPUS_OK)test_failed();
    cfgs++;
    CHECK_SETGET(OPUS_SET_EXPERT_FRAME_DURATION(i),OPUS_GET_EXPERT_FRAME_DURATION(&i),0,-1,
-     OPUS_FRAMESIZE_VARIABLE,OPUS_FRAMESIZE_ARG,
+         OPUS_FRAMESIZE_60_MS,OPUS_FRAMESIZE_ARG,
      "    OPUS_SET_EXPERT_FRAME_DURATION ............... OK.\n",
      "    OPUS_GET_EXPERT_FRAME_DURATION ............... OK.\n")