In this study, nanocrystalline Ni and Ni-diamond coatings were obtained by electrodeposition from tartrate electrolyte at ambient temperature aiming at improving corrosion and wear properties of the material. The created surfaces were investigated with regard to microhardness, adhesion, wear- and corrosion-resistance. The various methods such as atomic force microscopy, scanning electron microscopy, electrochemical impedance spectroscopy and linear polarization technique were applied to study the coating surface properties. The introduction of nanodiamond particles into the coating led to a rougher surface structure and a bigger grain size in comparison to bare nickel coating. Our study shows that the addition of 5·10⁻² (g dm⁻³) of nanodiamonds to the plating bath is enough to obtain composite coatings with a clear increase in microhardness and wear resistance. The slightly improved corrosion resistance of the coating, decrease in corrosion current density from 0.41 to 0.14 μA cm⁻² in neutral chloride-containing medium, and nobler values of the corrosion potential were also observed.