diff --git a/src/java/org/apache/poi/hssf/model/DrawingManager.java b/src/java/org/apache/poi/hssf/model/DrawingManager.java
index dd3a8daf8..db9e53255 100644
--- a/src/java/org/apache/poi/hssf/model/DrawingManager.java
+++ b/src/java/org/apache/poi/hssf/model/DrawingManager.java
@@ -25,7 +25,10 @@ import java.util.HashMap;
 
 /**
  * Provides utilities to manage drawing groups.
+ * 
+ * @deprecated in POI 3.15-beta2, scheduled for removal in 3.17, use DrawingManager2 instead
  */
+@Deprecated
 public class DrawingManager
 {
     EscherDggRecord dgg;
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
index 138b80af8..c15027792 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
@@ -21,6 +21,10 @@ import junit.framework.TestCase;
 import org.apache.poi.ddf.EscherDggRecord;
 import org.apache.poi.ddf.EscherDgRecord;
 
+/**
+ * @deprecated in POI 3.15-beta2, scheduled for removal in 3.17, use DrawingManager2 instead
+ */
+@Deprecated
 public final class TestDrawingManager extends TestCase {
     public void testFindFreeSPIDBlock() {
         EscherDggRecord dgg = new EscherDggRecord();