diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 381d3ea85..b67fb3ce1 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -865,6 +865,14 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
   if (priv->window->has_custom_frame_extents)
     return FALSE;
 
+  /*
+   * OpenJDK wrongly assumes that shaping a window implies no compositor
+   * shadows; make its compliance tests happy to give it what it wants ...
+   */
+  if (g_strcmp0 (priv->window->res_name, "sun-awt-X11-XWindowPeer") == 0 &&
+      priv->window->shape_region != NULL)
+    return FALSE;
+
   /*
    * Generate shadows for all other windows.
    */