diff --git a/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodStubsSelectionButtonGroup.java b/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodStubsSelectionButtonGroup.java
new file mode 100644
index 0000000000..861d985c98
--- /dev/null
+++ b/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodStubsSelectionButtonGroup.java
@@ -0,0 +1,379 @@
+package org.eclipse.reddeer.codegen.wizards;
+
+/*******************************************************************************
+ * Copyright (c) 2000, 2021 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.core.runtime.Assert;
+
+import org.eclipse.jdt.internal.junit.util.LayoutUtil;
+
+/**
+ * Due to the changes in org.eclipse.jdt.junit 3.12 codegen package got broken
+ * and could not be fixed easily from here. Issue: https://github.com/eclipse/reddeer/issues/2122
+ * Original content comes from https://git.eclipse.org/r/plugins/gitiles/jdt/eclipse.jdt.ui/+/refs/tags/I20210531-0600/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/MethodStubsSelectionButtonGroup.java
+ */
+public class MethodStubsSelectionButtonGroup {
+
+	private Label fLabel;
+	protected String fLabelText;
+
+	private boolean fEnabled;
+
+	private Composite fButtonComposite;
+
+	private Button[] fButtons;
+	private String[] fButtonNames;
+	private boolean[] fButtonsSelected;
+	private boolean[] fButtonsEnabled;
+
+	private int fGroupBorderStyle;
+	private int fGroupNumberOfColumns;
+	private int fButtonsStyle;
+
+	/**
+	 * Creates a group without border.
+	 * @param buttonsStyle one of {@link SWT#RADIO}, {@link SWT#CHECK}, or {@link SWT#TOGGLE}
+	 * @param jver the JUnit version
+	 * @param nColumns column count
+	 */
+	public MethodStubsSelectionButtonGroup(int buttonsStyle, String[] buttons, int nColumns) {
+		fEnabled= true;
+		fLabel= null;
+		fLabelText= ""; //$NON-NLS-1$
+
+		Assert.isTrue(buttonsStyle == SWT.RADIO || buttonsStyle == SWT.CHECK || buttonsStyle == SWT.TOGGLE);
+		int nButtons= updateButtons(buttons);
+		fButtonsSelected= new boolean[nButtons];
+		fButtonsEnabled= new boolean[nButtons];
+		for (int i= 0; i < nButtons; i++) {
+			fButtonsSelected[i]= false;
+			fButtonsEnabled[i]= true;
+		}
+
+		if (buttonsStyle == SWT.RADIO) {
+			fButtonsSelected[0]= true;
+		}
+
+		fGroupBorderStyle= SWT.NONE;
+		fGroupNumberOfColumns= (nColumns <= 0) ? nButtons : nColumns;
+
+		fButtonsStyle= buttonsStyle;
+	}
+
+	public int updateButtons(String[] buttons) {
+		fButtonNames= buttons;
+		int nButtons= fButtonNames.length;
+		if (fButtons != null) {
+			for (int i= 0; i < nButtons; i++) {
+				fButtons[i].setText(buttons[i]);
+				fButtons[i].requestLayout();
+			}
+		}
+		return nButtons;
+	}
+
+	/*
+	 * @see DialogField#doFillIntoGrid
+	 */
+	public Control[] doFillIntoGrid(Composite parent, int nColumns) {
+		assertEnoughColumns(nColumns);
+
+		if (fGroupBorderStyle == SWT.NONE) {
+			Label label= getLabelControl(parent);
+			label.setLayoutData(gridDataForLabel(1));
+
+			Composite buttonsgroup= getSelectionButtonsGroup(parent);
+			GridData gd= new GridData();
+			gd.horizontalSpan= nColumns - 1;
+			buttonsgroup.setLayoutData(gd);
+			return new Control[] { label, buttonsgroup };
+		} else {
+			Composite buttonsgroup= getSelectionButtonsGroup(parent);
+			GridData gd= new GridData();
+			gd.horizontalSpan= nColumns;
+			buttonsgroup.setLayoutData(gd);
+			return new Control[] { buttonsgroup };
+		}
+	}
+
+	/*
+	 * @see DialogField#doFillIntoGrid
+	 */
+	public int getNumberOfControls() {
+		return (fGroupBorderStyle == SWT.NONE) ? 2 : 1;
+	}
+
+	private Button createSelectionButton(int index, Composite group, SelectionListener listener) {
+		Button button= new Button(group, fButtonsStyle | SWT.LEFT);
+		button.setFont(group.getFont());
+		button.setText(fButtonNames[index]);
+		button.setEnabled(isEnabled() && isEnabled(index));
+		button.setSelection(isSelected(index));
+		button.addSelectionListener(listener);
+		return button;
+	}
+
+
+	/**
+	 * Returns the group widget. When called the first time, the widget will be created.
+	 * @param parent composite when called the first time, or <code>null</code>
+	 * after.
+	 * @return the created composite
+	 */
+	public Composite getSelectionButtonsGroup(Composite parent) {
+		if (fButtonComposite == null) {
+			assertCompositeNotNull(parent);
+
+			GridLayout layout= new GridLayout();
+			//layout.makeColumnsEqualWidth= true;
+			layout.numColumns= fGroupNumberOfColumns;
+
+			if (fGroupBorderStyle != SWT.NONE) {
+				Group group= new Group(parent, fGroupBorderStyle);
+				if (fLabelText != null && fLabelText.length() > 0) {
+					group.setText(fLabelText);
+				}
+				fButtonComposite= group;
+			} else {
+				fButtonComposite= new Composite(parent, SWT.NULL);
+				layout.marginHeight= 0;
+				layout.marginWidth= 0;
+			}
+			fButtonComposite.setLayout(layout);
+
+			SelectionListener listener= new SelectionListener() {
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					doWidgetSelected(e);
+				}
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					doWidgetSelected(e);
+				}
+			};
+			int nButtons= fButtonNames.length;
+			fButtons= new Button[nButtons];
+
+			for (int i= 0; i < nButtons; i++) {
+				fButtons[i]= createSelectionButton(i, fButtonComposite, listener);
+			}
+			int nRows= nButtons / fGroupNumberOfColumns;
+			int nFillElements= nRows * fGroupNumberOfColumns - nButtons;
+			for (int i= 0; i < nFillElements; i++) {
+				createEmptySpace(fButtonComposite);
+			}
+		}
+		return fButtonComposite;
+	}
+
+	protected void doWidgetSelected(SelectionEvent e) {
+		Button button= (Button)e.widget;
+		for (int i= 0; i < fButtons.length; i++) {
+			if (fButtons[i] == button) {
+				fButtonsSelected[i]= button.getSelection();
+				return;
+			}
+		}
+	}
+
+	/**
+	 * Returns the selection state of a button contained in the group.
+	 * @param index of the button
+	 * @return returns the selection state of a button contained in the group.
+	 */
+	public boolean isSelected(int index) {
+		if (index >= 0 && index < fButtonsSelected.length) {
+			return fButtonsSelected[index] && fButtonsEnabled[index];
+		}
+		return false;
+	}
+
+	/**
+	 * Sets the selection state of a button contained in the group.
+	 * @param index of the button
+	 * @param selected the new selection state of a button
+	 */
+	public void setSelection(int index, boolean selected) {
+		if (index >= 0 && index < fButtonsSelected.length) {
+			if (fButtonsSelected[index] != selected) {
+				fButtonsSelected[index]= selected;
+				if (fButtons != null) {
+					Button button= fButtons[index];
+					if (isOkToUse(button) && button.isEnabled()) {
+						button.setSelection(selected);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns the enabled state of a button contained in the group.
+	 * @param index of the button
+	 * @return returns the enabled state of a button contained in the group
+	 */
+	public boolean isEnabled(int index) {
+		if (index >= 0 && index < fButtonsEnabled.length) {
+			return fButtonsEnabled[index];
+		}
+		return false;
+	}
+
+	/**
+	 * Sets the enabled state of a button contained in the group.
+	 * @param index of the button
+	 * @param enabled  the new enabled state of a button
+	 */
+	public void setEnabled(int index, boolean enabled) {
+		if (index >= 0 && index < fButtonsEnabled.length) {
+			if (fButtonsEnabled[index] != enabled) {
+				fButtonsEnabled[index]= enabled;
+				if (fButtons != null) {
+					Button button= fButtons[index];
+					if (isOkToUse(button)) {
+						button.setEnabled(enabled);
+						if (!enabled) {
+							button.setSelection(false);
+						} else {
+							button.setSelection(fButtonsSelected[index]);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	protected void updateEnableState() {
+		if (fLabel != null) {
+			fLabel.setEnabled(fEnabled);
+		}
+		if (fButtons != null) {
+			boolean enabled= isEnabled();
+			for (int i= 0; i < fButtons.length; i++) {
+				Button button= fButtons[i];
+				if (isOkToUse(button)) {
+					button.setEnabled(enabled && fButtonsEnabled[i]);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Sets the label of the dialog field.
+	 * @param labeltext the text
+	 */
+	public void setLabelText(String labeltext) {
+		fLabelText= labeltext;
+	}
+
+	protected static GridData gridDataForLabel(int span) {
+		GridData gd= new GridData();
+		gd.horizontalSpan= span;
+		return gd;
+	}
+
+	/**
+	 * Creates or returns the created label widget.
+	 * @param parent The parent composite or <code>null</code> if the widget has
+	 * already been created.
+	 * @return the label control
+	 */
+	public Label getLabelControl(Composite parent) {
+		if (fLabel == null) {
+			assertCompositeNotNull(parent);
+
+			fLabel= new Label(parent, SWT.LEFT | SWT.WRAP);
+			fLabel.setFont(parent.getFont());
+			fLabel.setEnabled(fEnabled);
+			if (fLabelText != null && !"".equals(fLabelText)) { //$NON-NLS-1$
+				fLabel.setText(fLabelText);
+			} else {
+				// XXX: to avoid a 16 pixel wide empty label - revisit
+				fLabel.setText("."); //$NON-NLS-1$
+				fLabel.setVisible(false);
+			}
+		}
+		return fLabel;
+	}
+
+	/**
+	 * Creates a spacer control.
+	 * @param parent The parent composite
+	 * @return the control
+	 */
+	public static Control createEmptySpace(Composite parent) {
+		return createEmptySpace(parent, 1);
+	}
+
+	/**
+	 * Creates a spacer control with the given span.
+	 * The composite is assumed to have <code>MGridLayout</code> as
+	 * layout.
+	 * @param parent The parent composite
+	 * @param span the span
+	 * @return the control
+	 */
+	public static Control createEmptySpace(Composite parent, int span) {
+		return LayoutUtil.createEmptySpace(parent, span);
+	}
+
+	/**
+	 * Tests is the control is not <code>null</code> and not disposed.
+	 * @param control the control
+	 * @return the result
+	*/
+	protected final boolean isOkToUse(Control control) {
+		return (control != null) && !(control.isDisposed());
+	}
+
+	// --------- enable / disable management
+
+	/**
+	 * Sets the enable state of the dialog field.
+	 * @param enabled the enabled state
+	 */
+	public final void setEnabled(boolean enabled) {
+		if (enabled != fEnabled) {
+			fEnabled= enabled;
+			updateEnableState();
+		}
+	}
+
+	/**
+	 * Gets the enable state of the dialog field.
+	 * @return returns the enabled state
+	 */
+	public final boolean isEnabled() {
+		return fEnabled;
+	}
+
+	protected final void assertCompositeNotNull(Composite comp) {
+		Assert.isNotNull(comp, "uncreated control requested with composite null"); //$NON-NLS-1$
+	}
+
+	protected final void assertEnoughColumns(int nColumns) {
+		Assert.isTrue(nColumns >= getNumberOfControls(), "given number of columns is too small"); //$NON-NLS-1$
+	}
+}
diff --git a/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodsPage.java b/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodsPage.java
index e9d71a6a6d..0befa19e50 100644
--- a/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodsPage.java
+++ b/plugins/org.eclipse.reddeer.codegen/src/org/eclipse/reddeer/codegen/wizards/MethodsPage.java
@@ -18,7 +18,8 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jdt.internal.junit.util.LayoutUtil;
-import org.eclipse.jdt.internal.junit.wizards.MethodStubsSelectionButtonGroup;
+//import org.eclipse.jdt.internal.junit.wizards.MethodStubsSelectionButtonGroup;
+//import org.eclipse.jdt.junit.wizards.NewTestCaseWizardPageOne.JUnitVersion;
 import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -97,7 +98,7 @@ public void createControl(Composite parent) {
 		GridLayout layout = new GridLayout();
 		layout.numColumns = nColumns;
 		composite.setLayout(layout);
-
+		
 		String[] optionalButtonNames = new String[] { GETTER, SETTER, ACTION, CONSTANTS, INCLUDE_ALL, INHERITING };
 		fMethodOptionStubsButtons = new MethodStubsSelectionButtonGroup(SWT.CHECK, optionalButtonNames, 1) {
 			@Override