Groß Walddorf (also known as Gross Walddorf, Groß Bürgerwald, Gross Bürgerwald, Gross Buergerwald, and Olszynkę Wielką; population in 1905, 507) and Klein Walddorf (also known as Klein Bürgerwald, Klein Buergerwald, and Olszynkę Małą; population in 1905, 327) are now collectively known as Olszynka (coordinates: 54.3352, 18.6531 [54° 20′ 06″ N, 18° 39′ 11″ E]; population in 2013, 3,514), one of the quarters of Gdańsk (formerly Danzig), Poland.

Until 1793 the villages were part of Danzig in Royal Prussia (also known as Polish Prussia) in the Kingdom of Poland. The Second Partition of Poland in 1793 added Danzig and its surrounding territory to the province of West Prussia. The villages were situated in the district (Kreis) of Danzig from 1818 until 1887, when it became part of the district of Danziger Niederung. Groß Walddorf and Klein Walddorf became part of the Free City of Danzig from 1920 until the outbreak of World War II in 1939, when it came under the control of Nazi Germany. In February 1945 it was occupied by Soviet forces and eventually returned to Poland. At that time the two villages were combined into one.

The 1793 Danzig census does not list any Mennonites in either Groß Walddorf or Klein Walddorf. However, in 1820, Groß Walddorf had 99 inhabitants, including three Mennonites, and Klein Walddorf had 189 inhabitants, including four Mennonites.