The neoclassical viscous stress tensor is implemented in the non-linear MHD code XTOR-2F (Lütjens and Luciani 2010 J. Comput. Phys.229 8130–43), allowing consistent bi-fluid simulations of MHD modes, including the metastable branch of neoclassical tearing modes (NTMs) (Carrera et al 1986 Phys. Fluids29 899–902). Equilibrium flows and bootstrap current from the neoclassical theory are formally recovered in this Chew–Goldberger–Low formulation. The non-linear behaviour of the new model is verified on a test case coming from a Tore Supra non-inductive discharge. A NTM threshold that is larger than with the previous model is obtained. This is due to the fact that the velocity is now part of the bootstrap current and that it differs from the theoretical neoclassical value.