The present invention relates to an X-ray analysis apparatus and a method of X-ray analysis. The X-ray analysis apparatus enables a user to carry out a plurality of X-ray analysis applications, for analysing a sample by measuring X-ray diffraction and/or X-ray fluorescence, using the same X-ray source. The apparatus comprises an X-ray source for irradiating the sample with X-rays, the X-ray source comprising a solid anode and a cathode for emitting an electron beam. It also comprises a focusing arrangement for focusing the electron beam onto the anode, and a controller. The controller is configured to receive X-ray analysis application information and to control the X-ray analysis apparatus to selectively operate in either a first X-ray analysis mode or a second X-ray analysis mode based on the X-ray analysis application information. In the first X-ray analysis mode the X-ray source operates at a first operating power and has an effective focal spot size that is less than 100 μm. In the second X-ray analysis mode the X-ray source operates at a second operating power that is higher than the first operating power, and the area of the effective focal spot is larger than the area of the effective focal spot in the first X-ray analysis mode.